Feature/ticket 10