Revert "Merge pull request #7 from ihrthk/master"

This reverts commit 339ed4fdbd25c122298fbc897472119c71fa57bd, reversing
changes made to 9ff8bc36d31ce1709a0159d996423d2545946356.