Merge pull request #39 from dxwts/master

回归主干