Merge pull request #25 from shawnjohnson/master