Feature/issue 107