Merge pull request #186 from github/update/mcp-list-and-at-style-impo…

Merge pull request #186 from github/update/mcp-list-and-at-style-impo… #38