Feature/ticket 127