Merge pull request #790 from jaspersalathe/patch-1