Change websocket client to handle multiple subscriptions

Change websocket client to handle multiple subscriptions #1449