Merge pull request #51 from AlexandreBeaulne/groupedmetrics

Added grouped metrics feature