Feature/cel 100