Merge pull request #590 from Umeaboy/patch-9