Merge pull request #2 from Vin-Yang/master

同步代码