Feature/issue23