1/n1h part 2
Merge pull request #794 from abhinavc/master

1/n1h part 2