timeout fix
Merge pull request #88 from bstascavage/master

timeout fix