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

This reverts commit 8b713adb059c7c94bedc90cf82d8d3934ed3942d, reversing
changes made to 4848f26a6a2c029a682a251b203b5be5d2d56746.