added default timeouts
Merge origin/master