Added timeout to ensure we do not block forever
High CPU spikes when channel is closed.

Fixes #63
Merge remote-tracking branch 'origin/hotfix-2.0.5'