Add Timeout management
Merge pull request #5 from gmorel/fix/add_ability_to_manage_timeout

Add Timeout management