Fixes a problem with timeouts
Merge pull request #6 from warseph/master

Fixes a problem with timeouts