Merge pull request #5 from briancain/master

Revert "Merge pull request #4 from briancain/master"