Feature/fix issue 28