Merge pull request #2 from emrickgarrett/master

hi there
Merge pull request #40 from hill1303/master

Merge pull request #2 from emrickgarrett/master