Feature/issue 108