1/qdh part 1
Merge pull request #800 from abhinavc/master

1/qdh part 1