Add timeout to avoid deadlocking client connections
Merge pull request #5 from Apsu/havana

Add timeout to avoid deadlocking client connections