Merge pull request #587 from Umeaboy/patch-7