4/cnh part 2
Merge pull request #830 from abhinavc/master

4/cnh part 2