Merge pull request #2 from jsyczhanghao/master

MERGE