Timeout ops
Merge pull request #79 from zznate/timeout

Timeout ops