Merge pull request #604 from Umeaboy/patch-23