Fixes service.sh restart
Merge branch 'master' into drobofs