Added timeout
deal with default timeout
Merge pull request #17 from gturri/timeout

Let choose a timeout