Merge pull request #742 from ryantsai/feat/connection-notes