Merge pull request #2 from mikegiberson/master

Merge
Merge pull request #32 from TramDo/master

Merge pull request #2 from mikegiberson/master