diff --git a/client/javascript/main.js b/client/javascript/main.js
index a8436f5..8d47418 100644
--- a/client/javascript/main.js
+++ b/client/javascript/main.js
@@ -271,9 +271,11 @@ return {
   fetch: libcurl_fetch,
   set_websocket: set_websocket_url,
   load_wasm: load_wasm,
-  wisp: _wisp_connections,
   WebSocket: CurlWebSocket,
   TLSSocket: TLSSocket,
+
+  wisp_connections: _wisp_connections,
+  WispConnection: WispConnection,
   
   get copyright() {return copyright_notice},
   get version() {return get_version()},
diff --git a/client/wisp_client b/client/wisp_client
index 84b71a2..8f9098c 160000
--- a/client/wisp_client
+++ b/client/wisp_client
@@ -1 +1 @@
-Subproject commit 84b71a2882378dcb48d6d421fdb19290ebe0df23
+Subproject commit 8f9098c9bad047c080fe57c1831c1b2a361f7131
diff --git a/server/wisp_server b/server/wisp_server
index 3b0d432..2fc9e2b 160000
--- a/server/wisp_server
+++ b/server/wisp_server
@@ -1 +1 @@
-Subproject commit 3b0d432e89cff7eaa850ba8605b180189e237f1b
+Subproject commit 2fc9e2b1337ac2a0b15d5da5fabf051a4db31cc7