Revert "Merge pull request #28 from jack1314007/master"

This reverts commit 095f8f3e4e92c8b1a3697add2b7ccc7e229dc7da.
Revert 095f8f3..2cb3f9e

This rolls back to commit 095f8f3e4e92c8b1a3697add2b7ccc7e229dc7da.