Fix #115
Merge pull request #119 from telefonicaid/default_timeout

Fix #115