Attempt to recover from dropped connections
Merge pull request #91 from pretenders/carles/dropped-connections

Attempt to recover from dropped connections