Merge pull request #597 from Umeaboy/patch-16