Merge pull request #121 from pingping-lin/master

let the timeout value configurable