Updates #2
Merge pull request #2 from Vexil/master

Updates #2