Add disconnect back
Merge pull request #38 from ozten/fix-hang

Add disconnect back