Feature/ticket 200