Add a timeout config option
Merge pull request #1 from gdiaz/master

Merge "Add a timeout config option"