add autostart
Merge branch 'develop'