Merge pull request #28 from shawnjohnson/master