Merge pull request #1 from Vextroid/master

`
Merge pull request #3 from Ronald-W/master

Merge pull request #1 from Vextroid/master