1/m6h part 2
Merge pull request #790 from abhinavc/master

1/m6h part 2