Added -t/--time-out option to client