更新
Merge pull request #17 from zjcqoo/master

更新几个地方