Merge pull request #22 from zcmoore/master

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

Merge pull request #22 from zcmoore/master