Merge pull request #3 from emrickgarrett/master

pull request 2