Fix for issue #383
Support immediate cancellation of servers
Merge pull request #384 from wnagele/master

Fix for issue #383 & Support for immediate cancellation of servers