Merge pull request #1334 from Umeaboy/patch-36