Merge pull request #1 from Vextroid/master

Johnny pull request
Merge pull request #2 from JohnnyFan/master

rtrtrt