Finally got around to (hopefully) fixing Metrics!
Merge pull request #221 from Clashnia/hqm

Finally got around to (hopefully) fixing Metrics!