fix dos \n
Merge branch 'connTimeout'