Merge pull request #1 from liguangsong/master

Merge pull request #1 from YshadowZ/master