fixed wrong display of disconnection status, closes #17
Merge remote-tracking branch 'upstream/master'