Merge pull request #13 from ezfe/master

Synced Repos
Merge pull request #5 from calebsander/master

Merge pull request #13 from ezfe/master