Merge pull request #3 from jsyczhanghao/master

merge
Merge pull request #3 from PAFFE-UI/master

Merge pull request #3 from jsyczhanghao/master