Merge pull request #1349 from Umeaboy/patch-36