Merge pull request #2 from Vin-Yang/master

同步代码
Merge pull request #2 from Jensyn/master

Merge pull request #2 from Vin-Yang/master