Merge pull request #2 from emrickgarrett/master

Update
Merge pull request #6 from brobinson09/master

Merge pull request #2 from emrickgarrett/master