Merge pull request #943 from SvenRoederer/patch-1