added timeout to requestor
Merge remote-tracking branch 'origin/master'