Revert "merge"
Merge pull request #5 from hongsly/revert-3-master

Revert "merge"