1/n1h part 1
Merge pull request #793 from abhinavc/master

1/n1h part 1