Don't disconnect before connecting

Kind of a hack
Clean up on connect if disconnected and immediately if connected
Merge pull request #88 from adamvr/fix-end-with-queued

Don't disconnect before connecting