Merge pull request #588 from Umeaboy/patch-5