Merge pull request #591 from Umeaboy/patch-10