Revert "Merge pull request #47 from kurtpolinar/master"

This reverts commit 17b2c3b76de5f9b213b436bbae6d0cd96afab48a, reversing
changes made to 9d43bb08944dcef8149eca51655fd8fc5c473a3b.