Improved command line client. Added timeout support.