Add timeout switch to CLI - fixes #178

I had no idea if this should also be on the export command.
Also, because the terminate behaviour was not tested, no tests for this.