Merge pull request #2 from jsyczhanghao/master

MERGE
Merge pull request #2 from PAFFE-UI/master

Merge pull request #2 from jsyczhanghao/master