Revert "Merge pull request #9 from tonycn/master"

This reverts commit 3241540e837536f485e1139b970160b459d42820, reversing
changes made to ac6191964e59fb5378f007c132344f1e35939f32.