Added Metrics and other various small things.
Merge remote-tracking branch 'origin/master'