Revert "Merge pull request #29 from hollaburoo/master"

This reverts commit 949aa559b2fe2e15560f2c31d4c006e5a3fdf55e, reversing
changes made to 703324794e953c418976a38d0b5f276e70128cd3.