Merge pull request #355 from wcwang/next

[NFC] Adjusted connection status