Allow a timeout to be optionally specified
Merge pull request #10 from graememcc/timeout

Allow a timeout to be optionally specified