Revert "pull from extrame/master"
Merge pull request #2 from xjplke/revert-1-master

Revert "pull from extrame/master"