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

Done. It's pretty now. ;)