Feature/issue 17