Feature/socket reconnect