HQM updates

See spreadsheet under 0.9.6 updates.
Merge pull request #20 from vanityset/master

HQM updates