Refactoring code involving metrics renaming.
rebasing branch fir new changes
Merge pull request #96 from ahajirnis/metricsBug

Metrics bug