Merge pull request #594 from Umeaboy/patch-13