added restart stuff
Merge branch 'hotfix/fix_capfile'