oops
Merge again
Merge pull request #32 from eamonford/master

Merge pull request #3 from emrickgarrett/master
Merge pull request #4 from emrickgarrett/master

Getting latest