Merge pull request #1 from coldnight/master

合并tornado分支
Merge pull request #2 from coldnight/tornado

Merge pull request #1 from coldnight/master