Feature/ticket 227