First revamping of the Metrics CDI section
Merge branch 'master' of https://github.com/astefanutti/further-cdi