Updates
Merge pull request #1 from Vexil/master

Updates