added metrics
fixed merge
Merge pull request #75 from red-admirals-2014/meters

Meters