1/i5h part 2
Merge pull request #758 from abhinavc/master

1/i5h part 2