Feature/issue 4