Merge pull request #599 from Umeaboy/patch-18