Merge pull request #589 from Umeaboy/patch-8