Merge pull request #2 from Vextroid/master

pull
Merge pull request #3 from JohnnyFan/master

Merge pull request #2 from Vextroid/master