Corrected timeout
Merge pull request #89 from bstascavage/master

Corrected timeout