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

4/5nh part 1