Merge pull request #1 from Mrzy/master

同步代码