Adds a configurable timeout
Merge pull request #2 from jnovinger/add_timeout

Adds a configurable timeout