Merge branch 'release/0.0.2'
added restart stuff
Merge branch 'hotfix/fix_capfile' into develop