Timeout can now be specified on commandline with a -Dtimeout value