autostart app
Merge origin/master