Merge pull request #3 from emrickgarrett/master

pull request 2
Merge pull request #15 from mihirangal/master

Merge pull request #3 from emrickgarrett/master