1/l6h part 2
Merge pull request #777 from abhinavc/master

1/l6h part 2