QHE: minor channges
Merge branch 'origin/master'