Merge pull request #598 from Umeaboy/patch-17