diff --git a/examples/json-rpc-over-websocket/Makefile b/examples/json-rpc-over-websocket/Makefile
index d5d64ae0..ae6bcc07 100644
--- a/examples/json-rpc-over-websocket/Makefile
+++ b/examples/json-rpc-over-websocket/Makefile
@@ -4,7 +4,7 @@ all: $(PROG)
 	$(DEBUGGER) ./$(PROG) $(ARGS)
 
 $(PROG): main.c
-	$(CC) main.c mjson.c ../../mongoose.c -I../.. -W -Wall -DMG_ENABLE_LINES=1 $(CFLAGS) -o $(PROG)
+	$(CC) main.c ../../mongoose.c -I../.. -W -Wall -DMG_ENABLE_LINES=1 $(CFLAGS) -o $(PROG)
 
 clean:
 	rm -rf $(PROG) *.o *.dSYM *.gcov *.gcno *.gcda *.obj *.exe *.ilk *.pdb
diff --git a/examples/json-rpc-over-websocket/main.c b/examples/json-rpc-over-websocket/main.c
index 24afa2ac..847ee436 100644
--- a/examples/json-rpc-over-websocket/main.c
+++ b/examples/json-rpc-over-websocket/main.c
@@ -3,24 +3,68 @@
 //
 // See https://mongoose.ws/tutorials/json-rpc-over-websocket/
 
-#include "mjson.h"
 #include "mongoose.h"
 
 static const char *s_listen_on = "ws://localhost:8000";
 static const char *s_web_root = "web_root";
 
-static void sum(struct jsonrpc_request *r) {
+// RPC functions. Take string params, return (allocated) string result
+
+static char *sum(struct mg_str params) {
   double a = 0.0, b = 0.0;
-  mjson_get_number(r->params, r->params_len, "$[0]", &a);
-  mjson_get_number(r->params, r->params_len, "$[1]", &b);
-  jsonrpc_return_success(r, "%g", a + b);
+  mg_json_get_num(params, "$[0]", &a);
+  mg_json_get_num(params, "$[1]", &b);
+  return mg_mprintf("%g", a + b);
 }
 
-static void multiply(struct jsonrpc_request *r) {
+static char *multiply(struct mg_str params) {
   double a = 0.0, b = 0.0;
-  mjson_get_number(r->params, r->params_len, "$[0]", &a);
-  mjson_get_number(r->params, r->params_len, "$[1]", &b);
-  jsonrpc_return_success(r, "%g", a * b);
+  mg_json_get_num(params, "$[0]", &a);
+  mg_json_get_num(params, "$[1]", &b);
+  return mg_mprintf("%g", a * b);
+}
+
+static void process_json_message(struct mg_connection *c, struct mg_str frame) {
+  struct mg_str params = mg_str(""), id = mg_str("");
+  int params_off = 0, params_len = 0, id_off = 0, id_len = 0;
+  char *response = NULL;
+
+  // Parse websocket message, which should be a JSON-RPC frame like this:
+  // { "id": 3, "method": "sum", "params": [1,2] }
+  char *method = mg_json_get_str(frame, "$.method");
+  id_off = mg_json_get(frame.ptr, (int) frame.len, "$.id", &id_len);
+  params_off = mg_json_get(frame.ptr, (int) frame.len, "$.params", &params_len);
+  params = mg_str_n(frame.ptr + params_off, params_len);
+  id = mg_str_n(frame.ptr + id_off, id_len);
+
+  if (method == NULL || id_off < 0 || params_off < 0) {
+    // Invalid frame. Return error and include this frame as error message
+    response = mg_mprintf("{%Q:{%Q:%d,%Q:%.*Q}", "error", "code", -32700,
+                          "message", (int) frame.len, frame.ptr);
+  } else if (strcmp(method, "sum") == 0) {
+    char *result = sum(params);
+    response = mg_mprintf("{%Q:%.*s, %Q:%s}", "id", (int) id.len, id.ptr,
+                          "result", result);
+    free(result);
+  } else if (strcmp(method, "mul") == 0) {
+    char *result = multiply(params);
+    response = mg_mprintf("{%Q:%.*s, %Q:%s}", "id", (int) id.len, id.ptr,
+                          "result", result);
+    free(result);
+  } else {
+    response =
+        mg_mprintf("{%Q:%.*s, %Q:{%Q:%d,%Q:%Q}", "id", (int) id.len, id.ptr,
+                   "error", "code", -32601, "message", "Method not found");
+  }
+
+  // Send the response back to the client
+  if (response) {
+    mg_ws_printf(c, WEBSOCKET_OP_TEXT, "%s", response);
+    MG_INFO(("[%.*s] -> [%s]", (int) frame.len, frame.ptr, response));
+  }
+
+  free(method);
+  free(response);
 }
 
 // This RESTful server implements the following endpoints:
@@ -45,37 +89,28 @@ static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
   } else if (ev == MG_EV_WS_MSG) {
     // Got websocket frame. Received data is wm->data
     struct mg_ws_message *wm = (struct mg_ws_message *) ev_data;
-    struct mg_str req = wm->data;
-    char *response = NULL;
-    jsonrpc_process(req.ptr, req.len, mjson_print_dynamic_buf, &response, NULL);
-    mg_ws_send(c, response, strlen(response), WEBSOCKET_OP_TEXT);
-    MG_INFO(("[%.*s] -> [%s]", (int) req.len, req.ptr, response));
-    free(response);
+    process_json_message(c, wm->data);
   }
   (void) fn_data;
 }
 
 static void timer_fn(void *arg) {
   struct mg_mgr *mgr = (struct mg_mgr *) arg;
-  // Broadcast "hi" message to all connected websocket clients.
-  // Traverse over all connections
+  char *msg = mg_mprintf("{%Q:%Q,%Q:[%d,%d,%d]}", "method", "notification1",
+                         "params", 1, 2, 3);
+  // Broadcast message to all connected websocket clients.
   for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) {
     // Send JSON-RPC notifications to marked connections
-    const char *msg = "{\"method\":\"hiya!!\",\"params\":[1,2,3]}";
     if (c->label[0] == 'W') mg_ws_send(c, msg, strlen(msg), WEBSOCKET_OP_TEXT);
   }
+  free(msg);
 }
 
 int main(void) {
   struct mg_mgr mgr;  // Event manager
-
   mg_mgr_init(&mgr);  // Init event manager
+  mg_log_set("3");
   mg_timer_add(&mgr, 5000, MG_TIMER_REPEAT, timer_fn, &mgr);  // Init timer
-
-  jsonrpc_init(NULL, NULL);         // Init JSON-RPC instance
-  jsonrpc_export("sum", sum);       // And export a couple
-  jsonrpc_export("mul", multiply);  // of RPC functions
-
   printf("Starting WS listener on %s/websocket\n", s_listen_on);
   mg_http_listen(&mgr, s_listen_on, fn, NULL);  // Create HTTP listener
   for (;;) mg_mgr_poll(&mgr, 1000);             // Infinite event loop