Feature/issue 26