Feature/issue 8