Merge pull request #2 from Vextroid/master

pull