commit by leiluo
Merge branch 'master', remote-tracking branch 'mysql2cn/master'
Merge pull request #45 from leiluoifly/master

leiluo负责范围