Hopefully last timeout change
Merge pull request #90 from bstascavage/master

Hopefully last timeout change