Merge in PR #174: Automatic reconnection