Fix kicks - that was easy
Use correct disconnect sequence at all times, fixes #119 and events not firing at stop
Merge remote-tracking branch 'upstream/master'