Feature/issue 116