Revert "Merge pull request #20 from GGMethos/TuanBranch"

This reverts commit 470377385bdbd8671d0a41eb17fc7f75aca959e3, reversing
changes made to a68ff4d8f43e25a1f63bff793c473f0947f9dc53.