New attempt.
Merge pull request #133 from Clashnia/hqmbranch

New attempt.