Merge pull request #1 from PAFFE-UI/master

merge
Merge pull request #2 from jsyczhanghao/master

Merge pull request #1 from PAFFE-UI/master