Merge pull request #27 from shawnjohnson/master