Feature/issue 32