Set timeouts properly
Merge pull request #336 from tewalds/timeouts

Set timeouts properly