Merge pull request #1198 from Umeaboy/patch-28