Feature/ci ready