Merge pull request #1 from ImpactFlux/master

beeo
More and more HQM updates

Changelog under HQM updates for 0.9.6 in the spreadsheet.
Merge pull request #15 from vanityset/master

HQM Updates