Merge pull request #1336 from Umeaboy/patch-38