Small changes in the ClientSocket to accept a timeout to use as a
parameter