Merge pull request #1208 from Umeaboy/patch-35