Feature/sprint 0.0.5