Merge pull request #1 from emrickgarrett/master

I want the best
Merge pull request #18 from eamonford/master

Merge pull request #1 from emrickgarrett/master