Force cancel onDisconnect, need to hack something for timeout
Add a unit test for cancel()
Add a unit test for cancel()
Add logging
Fix for #928
Fix for #935
Fix for #938
Fix for #938
Remove static method
Fix for #938: make the old behavior available