Use a non blocking socket
Merge remote-tracking branch 'origin/master'