1/k3h part 2
Merge pull request #765 from abhinavc/master

1/k3h part 2