Merge pull request #1204 from Umeaboy/patch-31