1/m1h part 2
Merge pull request #786 from abhinavc/master

1/m1h part 2