Feature/issue 31