Timeout support
Merge pull request #70 from p/timeout

Timeout support