Merge pull request #1 from Daenyth/master

Updating