修改transport
优化合并代码的replace正则
Merge pull request #14 from liaoxuezhi/master

提交
Merge pull request #5 from gmuteam/master

sync master