Merge pull request #979 from jahir/patch-1