Feature/issue 14