Merge branch 'develop_branch2' of https://github.com/dianping/puma into develop
Merge pull request #18 from atellwu/develop

Merge jinhua的代码