1/jhh part 1
Merge pull request #761 from abhinavc/master

1/jhh part 1