support for changing the timeout
Merge remote-tracking branch 'origin/master'