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

2/42h part 1