TMF628 fixes for METRICO

Kostis Trantzasrequested to merge
tmf628 into develop

Closes #32 (closed)

Edited by Kostis Trantzas

Merge request reports