Update
Merge pull request #3 from Vexil/master

Update