Feature/issue 49 add metrics