diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5360bebfd..714ded96c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Solar Module SM200 support
 - `set master_thermostat <product id>` to choose with thermostat is master when there are multiple on the bus
+- MM10 Mixer support (thanks @MichaelDvP)
 
 ### Fixed
 - set boiler warm water temp on Junkers/Bosch HT3
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 4797234b3..728b45b33 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -478,12 +478,11 @@ void showInfo() {
             if (EMS_Mixing.hc[hc_num - 1].active) {
                 myDebug_P(PSTR("  Mixing Circuit %d"), hc_num);
                 _renderUShortValue(" Current flow temperature", "C", EMS_Mixing.hc[hc_num - 1].flowTemp);
-                if (EMS_Mixing.hc[hc_num - 1].flowSetTemp != EMS_VALUE_INT_NOTSET) 
+                if (EMS_Mixing.hc[hc_num - 1].flowSetTemp != EMS_VALUE_INT_NOTSET)
                     _renderIntValue(" Setpoint flow temperature", "C", EMS_Mixing.hc[hc_num - 1].flowSetTemp);
                 _renderIntValue(" Current pump modulation", "%", EMS_Mixing.hc[hc_num - 1].pumpMod);
-                if (EMS_Mixing.hc[hc_num - 1].valveStatus != EMS_VALUE_INT_NOTSET) 
+                if (EMS_Mixing.hc[hc_num - 1].valveStatus != EMS_VALUE_INT_NOTSET)
                     _renderIntValue(" Current valve status", "", EMS_Mixing.hc[hc_num - 1].valveStatus);
-                
             }
         }
     }
@@ -597,7 +596,7 @@ void publishEMSValues(bool force) {
             rootBoiler["sysPress"] = (float)EMS_Boiler.sysPress / 10;
         if (EMS_Boiler.boilTemp != EMS_VALUE_USHORT_NOTSET)
             rootBoiler["boilTemp"] = (float)EMS_Boiler.boilTemp / 10;
-       if (EMS_Boiler.exhaustTemp != EMS_VALUE_USHORT_NOTSET)
+        if (EMS_Boiler.exhaustTemp != EMS_VALUE_USHORT_NOTSET)
             rootBoiler["exhaustTemp"] = (float)EMS_Boiler.exhaustTemp / 10;
         if (EMS_Boiler.wWActivated != EMS_VALUE_BOOL_NOTSET)
             rootBoiler["wWActivated"] = _bool_to_char(s, EMS_Boiler.wWActivated);
diff --git a/src/ems.cpp b/src/ems.cpp
index c82e20d3e..b47b791f2 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -130,11 +130,11 @@ void ems_init() {
     }
 
     // UBAParameterWW
-    EMS_Boiler.wWActivated   = EMS_VALUE_BOOL_NOTSET; // Warm Water activated
-    EMS_Boiler.wWSelTemp     = EMS_VALUE_INT_NOTSET;  // Warm Water selected temperature
-    EMS_Boiler.wWCircPump    = EMS_VALUE_BOOL_NOTSET; // Warm Water circulation pump available
+    EMS_Boiler.wWActivated     = EMS_VALUE_BOOL_NOTSET; // Warm Water activated
+    EMS_Boiler.wWSelTemp       = EMS_VALUE_INT_NOTSET;  // Warm Water selected temperature
+    EMS_Boiler.wWCircPump      = EMS_VALUE_BOOL_NOTSET; // Warm Water circulation pump available
     EMS_Boiler.wWDesinfectTemp = EMS_VALUE_INT_NOTSET;  // Warm Water desinfection temperature to prevent infection
-    EMS_Boiler.wWComfort     = EMS_VALUE_INT_NOTSET;  // WW comfort mode
+    EMS_Boiler.wWComfort       = EMS_VALUE_INT_NOTSET;  // WW comfort mode
 
     // UBAMonitorFast
     EMS_Boiler.selFlowTemp = EMS_VALUE_INT_NOTSET;    // Selected flow temperature
@@ -1239,8 +1239,8 @@ void _process_MMPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
 }
 
 void _process_MMStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
-    uint8_t hc = (EMS_RxTelegram->type - EMS_TYPE_MMStatusMessage); 
-    if (hc!=0) {
+    uint8_t hc = (EMS_RxTelegram->type - EMS_TYPE_MMStatusMessage);
+    if (hc != 0) {
         return; // invalid type
     }
     EMS_Mixing.hc[hc].active = true;
diff --git a/src/ems.h b/src/ems.h
index abf802e34..efc3a3f27 100644
--- a/src/ems.h
+++ b/src/ems.h
@@ -251,11 +251,11 @@ typedef struct {
     char         version[10];
 
     // UBAParameterWW
-    uint8_t wWActivated;   // Warm Water activated
-    uint8_t wWSelTemp;     // Warm Water selected temperature
-    uint8_t wWCircPump;    // Warm Water circulation pump Available
+    uint8_t wWActivated;     // Warm Water activated
+    uint8_t wWSelTemp;       // Warm Water selected temperature
+    uint8_t wWCircPump;      // Warm Water circulation pump Available
     uint8_t wWDesinfectTemp; // Warm Water desinfection temperature
-    uint8_t wWComfort;     // Warm water comfort or ECO mode
+    uint8_t wWComfort;       // Warm water comfort or ECO mode
 
     // UBAMonitorFast
     uint8_t  selFlowTemp;        // Selected flow temperature
diff --git a/src/version.h b/src/version.h
index 8575109af..1caa42c6a 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.5b6"
+#define APP_VERSION "1.9.5b7"