Revert "Merge pull request #20 from hycis/master"

This reverts commit b6fa093ecf020147f697310d4ccbc485280dcbd9, reversing
changes made to 12eeb82762e9db0d950047f56cda4b950a52f55d.