Long timeout implementation
Merge pull request #66 from santigimeno/long_timeout

Long timeout implementation