Merge pull request #601 from Umeaboy/patch-20