Feature/issue 151