Added support for --verbose and --timeout flags