Adding some enhancements
Merge branch 'master' of https://github.com/chocolatetoothpaste/metric