Merge pull request #3 from olamy/fix_timeout

simplify timeout configuration and increase a bit the value