2/42h part 2
Merge pull request #820 from abhinavc/master

2/42h part 2