Merge pull request #6 from emrickgarrett/master

Merge