Hopefully make playback work
Merge branch 'master' of github.com:adr2370/MockTok
Handle disconnect properly
Fix the merge (I hope)