Merge pull request #1 from exhibit/master

自动更新？
Merge pull request #6 from zhenglingfei/master

Merge pull request #1 from exhibit/master