Revert "Merge pull request #5 from heuripedes/master"

This reverts commit fb3423a82b5c07d9dc5932282b28ad0fa305b7ff, reversing
changes made to 122ea09a83e948930992668ce9bc5aa7d07c8875.