Merge pull request #1 from MrMarDok/master

Update