Merge pull request #36 from shawnjohnson/master