Feature/issue 5