Merge branch 'hotfix-2.0.3'
Merge branch 'hotfix-2.0.4'
Added timeout to ensure we do not block forever
High CPU spikes when channel is closed.

Fixes #63
Merge branch 'hotfix-2.0.5' into develop