Merge pull request #1 from TheDarklingWolf/master

Update