1/m1h part 3
Merge pull request #787 from abhinavc/master

1/m1h part 3