Merge pull request #2 from mikegiberson/master

Merge