Merge pull request #1 from darknesswind/master

同步主干
Merge pull request #1 from gnenbu/master

Merge pull request #1 from darknesswind/master