fix pthread conflict with new
Merge branch 'master' of https://github.com/piboye/conet