Revert "Merge pull request #55 from nghenglim/master"

This reverts commit c6cfa2f0cbe79a51a8d7d5f0014b8fcda998b978, reversing
changes made to f070065d85c38aff72e1bebc8a846738acc696ea.