Merge pull request #585 from Umeaboy/patch-4