Timeout support
Merge pull request #39 from mjmaenpaa/timeout

Timeout support