Rename and move of Metrics class...eliminates the nomethoderrors?
Merge branch 'master' into development