Merge pull request #1 from darknesswind/master

同步主干