Merge pull request #1335 from Umeaboy/patch-37