fix JTM metric for classes
cleanup
Merge branch 'master' of github.com:BasLeijdekkers/MetricsReloaded