fix exception in disconnect method
Merge branch 'devel'