Feature/issue 106