Revert 7a5a2b7..39c2941

This rolls back to commit 7a5a2b7b3bd4b8c645297df796495b6927924c73.
Merge pull request #3 from lawlietsun/master

Merge pull request #2 from lawlietsun/develop
Merge pull request #4 from lawlietsun/develop

merge