Merge pull request #3 from emrickgarrett/master

Update
Merge pull request #16 from brobinson09/master

Merge pull request #3 from emrickgarrett/master