Add default timeout
Merge pull request #132 from zachriggle/timeout-default

Add default timeout