Feature/ticket 92