Roggsy Merge pull request #2 from Tllya/patch-1