Merge pull request #731 from wpreul/master

Adding support for restarting servers
Remove non-working forceful shutdown
Closes #656
Fixing test and typo