Merge pull request #1197 from Umeaboy/patch-27