Merge pull request #1206 from Umeaboy/patch-33