Add timeouts
Merge pull request #1 from eskil/master

Add timeouts