Merge pull request #2 from emrickgarrett/master

Updated
Merge pull request #28 from eamonford/master

Merge pull request #2 from emrickgarrett/master