Merge branch 'devel'
Playing around with restart
Fixed Gagarin's restart routine
Merge branch 'restart' into devel
Remember to clear the timeout!