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

This reverts commit f814ed9d99aa0d5712799cf293e960b342649104, reversing
changes made to 5eb05f257800a2174654de0a0e56127ecb6fda7d.