Feature/issue 171 points 0