Merge pull request #40 from obourdon/master

Fix for uniformization of metric names