Feature/ticket 99