Merge pull request #5 from emrickgarrett/master

Update to merge
Merge pull request #22 from brobinson09/master

Merge pull request #5 from emrickgarrett/master