Fix Timeout management
Merge pull request #6 from gmorel/fix/add_ability_to_manage_timeout

Fix Timeout management