Added timeout option
Merge pull request #2 from freeall/timeout

Added timeout option