Added --timeout option