Merge pull request #1 from redguardtoo/master

Update