Feature/issue 009