Merge pull request #26 from shawnjohnson/master