Merge pull request #1342 from Umeaboy/patch-42