Merge pull request #3 from Vextroid/master

0
Merge pull request #6 from JohnnyFan/master

Merge pull request #3 from Vextroid/master