Feature/issue 13