Worked more on metrics
Merge pull request #5 from kbaileyky/master

Worked more on metrics