Merge pull request #1 from xfxyjwf/master

cc
Merge pull request #4 from xiaofeng-gg/master

Merge pull request #1 from xfxyjwf/master