Merge pull request #1345 from Umeaboy/patch-44