Merge pull request #3 from jsyczhanghao/master

merge