fixed timeout option
Merge pull request #844 from Zenya/master

fixed timeout option