Merge pull request #1344 from Umeaboy/patch-43