Merge pull request #3 from Cyprias/master

update
Update Metrics to latest version
General code cleanup

- Format most files
Merge remote-tracking branch 'timr/master'