Merge pull request #1 from Vextroid/master

`