1/m1h part 1
Merge pull request #785 from abhinavc/master

1/m1h part 1