Revert "Merge pull request #26 from emorash/master"

This reverts commit be07ae575b30299e4f4b79e649eb63783635d2ba, reversing
changes made to 300f939035070c2311d7d2a38411e9f0fdad66bf.