1/qdh part 2
Merge pull request #801 from abhinavc/master

1/qdh part 2