Feature/ticket 125