Revert "Merge pull request #6 from Grundik/master"

This reverts commit 15e583b026ecc1851119efe58f1e54af378b49f5, reversing
changes made to e332aefead3be0e1a72c2e4fe1b26ebdb5ff36db.