Revert "Merge pull request #36 from rYsvelain/master"

This reverts commit ddc0172ee51408a06f8ead1beef3c6044c230444, reversing
changes made to 0d9d89b6badae3eadf1635068811a61a23562a0a.