Feature/autostart