Taking the bug fix in Metrics operations
Ported bug fix from hydra spec branch
Merge pull request #11 from AuxMon/master_fix

Port the metrics bug fix
Merge pull request #12 from AuxMon/master

Taking the bug fix in Metrics