Feature/issue 15