Merge pull request #580 from Umeaboy/patch-3