Merge pull request #1254 from Mailaender/patch-1