Merge pull request #3 from Vextroid/master

0
Merge pull request #4 from JohnnyFan/master

Merge pull request #3 from Vextroid/master