update from working version
Merge branch 'master' of https://github.com/chriscx/metrics
pull & merge