diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 25768258..d76289fb 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All changes to this project will be documented in this file.
 
+## [7.8.9] - 2020-01-04
+
+(ws send + receive) handle all message types (ping + pong + fragment) / investigate #140
+
 ## [7.8.8] - 2019-12-28
 
 (mbedtls) fix related to private key file parsing and initialization
diff --git a/ixwebsocket/IXWebSocketVersion.h b/ixwebsocket/IXWebSocketVersion.h
index 824a42f8..ffe80e56 100644
--- a/ixwebsocket/IXWebSocketVersion.h
+++ b/ixwebsocket/IXWebSocketVersion.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "7.8.8"
+#define IX_WEBSOCKET_VERSION "7.8.9"
diff --git a/ws/ws_receive.cpp b/ws/ws_receive.cpp
index 867ba230..fc9c438b 100644
--- a/ws/ws_receive.cpp
+++ b/ws/ws_receive.cpp
@@ -234,6 +234,14 @@ namespace ix
                 ss << "HTTP Status: " << msg->errorInfo.http_status << std::endl;
                 log(ss.str());
             }
+            else if (msg->type == ix::WebSocketMessageType::Ping)
+            {
+                log("ws_receive: received ping");
+            }
+            else if (msg->type == ix::WebSocketMessageType::Pong)
+            {
+                log("ws_receive: received pong");
+            }
             else
             {
                 ss << "ws_receive: Invalid ix::WebSocketMessageType";
diff --git a/ws/ws_send.cpp b/ws/ws_send.cpp
index 98acb1d1..6360c58d 100644
--- a/ws/ws_send.cpp
+++ b/ws/ws_send.cpp
@@ -166,6 +166,18 @@ namespace ix
                 ss << "HTTP Status: " << msg->errorInfo.http_status << std::endl;
                 log(ss.str());
             }
+            else if (msg->type == ix::WebSocketMessageType::Ping)
+            {
+                spdlog::info("ws_send: received ping");
+            }
+            else if (msg->type == ix::WebSocketMessageType::Pong)
+            {
+                spdlog::info("ws_send: received pong");
+            }
+            else if (msg->type == ix::WebSocketMessageType::Fragment)
+            {
+                spdlog::info("ws_send: received fragment");
+            }
             else
             {
                 ss << "ws_send: Invalid ix::WebSocketMessageType";