Merge pull request #4 from Vextroid/master

飞
Merge pull request #5 from JohnnyFan/master

Merge pull request #4 from Vextroid/master