Merge pull request #31 from shawnjohnson/master