Feature/ticket 118