Added Timeout parameters
Closes #130