Timeout implementation - fixing issue #2