Added timeout argument

Merged Marius Kriegerowski requested to merge feature/timeout into master

Merge request reports