Merge pull request #1259 from khellang/patch-1