Merge pull request #35 from shawnjohnson/master