Feature/issue 159 restart services

Fixes #159.