1/l6h part 3
Merge pull request #778 from abhinavc/master

1/l6h part 3