Added dynamic timeout to client

This let the user specify how long the time timeout for the client
should be.