Revert "Merge pull request #3 from funkey/master"

This reverts commit cae282ea45b624583c6e33e9e1208f7f326c7ad0, reversing
changes made to addbad7a523fc0b0bac7a085255f7decad694594.