Updated metrics
Merge pull request #24 from sportingsolutions/dev-CINT-215-metrics-redefinition

#CINT-215