Merge pull request #596 from Umeaboy/patch-15