Feature/issue 43