Made connection handling multi-threaded
Merge remote-tracking branch 'origin/master'