Revert "Merge pull request #29 from huynhjjk/master"

This reverts commit d1ddf502c363a71f8394a8277eeae732a353ce8c, reversing
changes made to d67c6578b8d56c9b98fc6862d59e7be0c9c27419.