Merge pull request #1398 from Umeaboy/patch-1