Making the socket not pause the while loop if it doesn't receive data.

Merge