Merge pull request #1337 from Umeaboy/patch-39