Merge pull request #1199 from Umeaboy/patch-29