Merge pull request #1 from coldnight/master

合并tornado分支