Merge pull request #75 from opennetworkinglab/devl/disconnect_bug

Devl/disconnect bug