Fix disconnect and unbind which weren't really working
Merge pull request #160 from somdoron/FixDisconnectUnbind

Fix disconnect and unbind which weren't really working