1/m6h part 1
Merge pull request #789 from abhinavc/master

1/m6h part 1