diff --git a/Code/Arduino/HanReader/src/HanReader.cpp b/Code/Arduino/HanReader/src/HanReader.cpp
index ddbcd0fc..848b5eae 100644
--- a/Code/Arduino/HanReader/src/HanReader.cpp
+++ b/Code/Arduino/HanReader/src/HanReader.cpp
@@ -5,20 +5,26 @@ HanReader::HanReader()
   
 }
 
+void HanReader::setup(HardwareSerial *hanPort, unsigned long baudrate, SerialConfig config, Stream *debugPort)
+{
+	// Initialize H/W serial port for MBus communication
+	hanPort->begin(baudrate, config);
+	while (!hanPort) {}
+	bytesRead = 0;
+	han = hanPort;
+
+	debug = debugPort;
+	if (debug) debug->println("MBUS serial setup complete");
+}
+
 void HanReader::setup(HardwareSerial *hanPort)
 {
-  // Initialize H/W serial port for MBus communication
-  hanPort->begin(2400, SERIAL_8E1);
-  while (!hanPort) {}
-  bytesRead = 0;
-  han = hanPort;
+	setup(hanPort, 2400, SERIAL_8E1, NULL);
 }
 
 void HanReader::setup(HardwareSerial *hanPort, Stream *debugPort)
 {
-  setup(hanPort);
-  debug = debugPort;
-  if (debug) debug->println("MBUS serial setup complete");
+	setup(hanPort, 2400, SERIAL_8E1, debugPort);
 }
 
 bool HanReader::read()
diff --git a/Code/Arduino/HanReader/src/HanReader.h b/Code/Arduino/HanReader/src/HanReader.h
index b19a8a7f..aeb47b90 100644
--- a/Code/Arduino/HanReader/src/HanReader.h
+++ b/Code/Arduino/HanReader/src/HanReader.h
@@ -18,6 +18,7 @@ class HanReader
     HanReader();
     void setup(HardwareSerial *hanPort);
     void setup(HardwareSerial *hanPort, Stream *debugPort);
+	void setup(HardwareSerial *hanPort, unsigned long baudrate, SerialConfig config, Stream *debugPort);
     bool read();
 	List getList();
 	time_t getPackageTime();
diff --git a/Code/ESPDebugger/HanReader.cpp b/Code/ESPDebugger/HanReader.cpp
index ddbcd0fc..848b5eae 100644
--- a/Code/ESPDebugger/HanReader.cpp
+++ b/Code/ESPDebugger/HanReader.cpp
@@ -5,20 +5,26 @@ HanReader::HanReader()
   
 }
 
+void HanReader::setup(HardwareSerial *hanPort, unsigned long baudrate, SerialConfig config, Stream *debugPort)
+{
+	// Initialize H/W serial port for MBus communication
+	hanPort->begin(baudrate, config);
+	while (!hanPort) {}
+	bytesRead = 0;
+	han = hanPort;
+
+	debug = debugPort;
+	if (debug) debug->println("MBUS serial setup complete");
+}
+
 void HanReader::setup(HardwareSerial *hanPort)
 {
-  // Initialize H/W serial port for MBus communication
-  hanPort->begin(2400, SERIAL_8E1);
-  while (!hanPort) {}
-  bytesRead = 0;
-  han = hanPort;
+	setup(hanPort, 2400, SERIAL_8E1, NULL);
 }
 
 void HanReader::setup(HardwareSerial *hanPort, Stream *debugPort)
 {
-  setup(hanPort);
-  debug = debugPort;
-  if (debug) debug->println("MBUS serial setup complete");
+	setup(hanPort, 2400, SERIAL_8E1, debugPort);
 }
 
 bool HanReader::read()
diff --git a/Code/ESPDebugger/HanReader.h b/Code/ESPDebugger/HanReader.h
index b19a8a7f..aeb47b90 100644
--- a/Code/ESPDebugger/HanReader.h
+++ b/Code/ESPDebugger/HanReader.h
@@ -18,6 +18,7 @@ class HanReader
     HanReader();
     void setup(HardwareSerial *hanPort);
     void setup(HardwareSerial *hanPort, Stream *debugPort);
+	void setup(HardwareSerial *hanPort, unsigned long baudrate, SerialConfig config, Stream *debugPort);
     bool read();
 	List getList();
 	time_t getPackageTime();