Merge pull request #1350 from Umeaboy/patch-37