Merge pull request #603 from Umeaboy/patch-22