功能二
Merge pull request #2 from exhibit/master

功能二