Merge pull request #2 from YuShunyo/master

222222222223333333333333333
Merge pull request #3 from YuShunyo/New-branch

Merge pull request #2 from YuShunyo/master