Merge pull request #6 from emrickgarrett/master

Merge
Merge pull request #24 from brobinson09/master

Merge pull request #6 from emrickgarrett/master