1/l6h part 4
Merge pull request #779 from abhinavc/master

1/l6h part 4