Added support for --timeout