Feature/issue 12