4/1nh part 1
Merge pull request #768 from abhinavc/master

4/1nh part 1