Feature/issue 24 patch