Merge pull request #1 from ashenwolf/master

Update