Feature/issue 44 custom restarts