Merge pull request #1 from jinshaohui/master

merge