Feature/issue 2