Merge pull request #21 from zcmoore/master

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

Merge pull request #21 from zcmoore/master