diff --git a/lib/TasmotaSerial-2.2.0/README.md b/lib/TasmotaSerial-2.3.0/README.md
similarity index 100%
rename from lib/TasmotaSerial-2.2.0/README.md
rename to lib/TasmotaSerial-2.3.0/README.md
diff --git a/lib/TasmotaSerial-2.2.0/examples/swsertest/swsertest.ino b/lib/TasmotaSerial-2.3.0/examples/swsertest/swsertest.ino
similarity index 100%
rename from lib/TasmotaSerial-2.2.0/examples/swsertest/swsertest.ino
rename to lib/TasmotaSerial-2.3.0/examples/swsertest/swsertest.ino
diff --git a/lib/TasmotaSerial-2.2.0/keywords.txt b/lib/TasmotaSerial-2.3.0/keywords.txt
similarity index 95%
rename from lib/TasmotaSerial-2.2.0/keywords.txt
rename to lib/TasmotaSerial-2.3.0/keywords.txt
index 87974971e..9cf6d825c 100644
--- a/lib/TasmotaSerial-2.2.0/keywords.txt
+++ b/lib/TasmotaSerial-2.3.0/keywords.txt
@@ -14,6 +14,7 @@ TasmotaSerial	KEYWORD1
 #######################################
 
 begin	KEYWORD2
+hardwareSerial  KEYWORD2
 read	KEYWORD2
 write	KEYWORD2
 available	KEYWORD2
diff --git a/lib/TasmotaSerial-2.2.0/library.json b/lib/TasmotaSerial-2.3.0/library.json
similarity index 94%
rename from lib/TasmotaSerial-2.2.0/library.json
rename to lib/TasmotaSerial-2.3.0/library.json
index 23a2ddab9..fad36bcc6 100644
--- a/lib/TasmotaSerial-2.2.0/library.json
+++ b/lib/TasmotaSerial-2.3.0/library.json
@@ -1,6 +1,6 @@
 {
     "name": "TasmotaSerial",
-    "version": "2.2.0",
+    "version": "2.3.0",
     "keywords": [
       "serial", "io", "TasmotaSerial"
     ],
diff --git a/lib/TasmotaSerial-2.2.0/library.properties b/lib/TasmotaSerial-2.3.0/library.properties
similarity index 94%
rename from lib/TasmotaSerial-2.2.0/library.properties
rename to lib/TasmotaSerial-2.3.0/library.properties
index 54c79e218..095077d8e 100644
--- a/lib/TasmotaSerial-2.2.0/library.properties
+++ b/lib/TasmotaSerial-2.3.0/library.properties
@@ -1,5 +1,5 @@
 name=TasmotaSerial
-version=2.2.0
+version=2.3.0
 author=Theo Arends
 maintainer=Theo Arends <theo@arends.com>
 sentence=Implementation of software serial with hardware serial fallback for ESP8266.
diff --git a/lib/TasmotaSerial-2.2.0/src/TasmotaSerial.cpp b/lib/TasmotaSerial-2.3.0/src/TasmotaSerial.cpp
similarity index 97%
rename from lib/TasmotaSerial-2.2.0/src/TasmotaSerial.cpp
rename to lib/TasmotaSerial-2.3.0/src/TasmotaSerial.cpp
index 3df42f834..eecdeb124 100644
--- a/lib/TasmotaSerial-2.2.0/src/TasmotaSerial.cpp
+++ b/lib/TasmotaSerial-2.3.0/src/TasmotaSerial.cpp
@@ -1,7 +1,7 @@
 /*
   TasmotaSerial.cpp - Minimal implementation of software serial for Tasmota
 
-  Copyright (C) 2018 Theo Arends
+  Copyright (C) 2019 Theo Arends
 
   This library is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -100,7 +100,7 @@ TasmotaSerial::TasmotaSerial(int receive_pin, int transmit_pin, int hardware_fal
       m_buffer = (uint8_t*)malloc(TM_SERIAL_BUFFER_SIZE);
       if (m_buffer == NULL) return;
       // Use getCycleCount() loop to get as exact timing as possible
-      m_bit_time = ESP.getCpuFreqMHz() *1000000 /TM_SERIAL_BAUDRATE;
+      m_bit_time = F_CPU / TM_SERIAL_BAUDRATE;
       pinMode(m_rx_pin, INPUT);
       tms_obj_list[m_rx_pin] = this;
       attachInterrupt(m_rx_pin, ISRList[m_rx_pin], FALLING);
@@ -145,7 +145,7 @@ bool TasmotaSerial::begin(long speed, int stop_bits) {
     }
   } else {
     // Use getCycleCount() loop to get as exact timing as possible
-    m_bit_time = ESP.getCpuFreqMHz() *1000000 /speed;
+    m_bit_time = F_CPU / speed;
     m_high_speed = (speed > 9600);
   }
   return m_valid;
@@ -257,7 +257,7 @@ void TasmotaSerial::rxRead()
     TM_SERIAL_WAIT;
   }
   // Store the received value in the buffer unless we have an overflow
-  int next = (m_in_pos+1) % TM_SERIAL_BUFFER_SIZE;
+  unsigned int next = (m_in_pos+1) % TM_SERIAL_BUFFER_SIZE;
   if (next != (int)m_out_pos) {
     m_buffer[m_in_pos] = rec;
     m_in_pos = next;
diff --git a/lib/TasmotaSerial-2.2.0/src/TasmotaSerial.h b/lib/TasmotaSerial-2.3.0/src/TasmotaSerial.h
similarity index 96%
rename from lib/TasmotaSerial-2.2.0/src/TasmotaSerial.h
rename to lib/TasmotaSerial-2.3.0/src/TasmotaSerial.h
index de991526a..9481ef370 100644
--- a/lib/TasmotaSerial-2.2.0/src/TasmotaSerial.h
+++ b/lib/TasmotaSerial-2.3.0/src/TasmotaSerial.h
@@ -1,7 +1,7 @@
 /*
   TasmotaSerial.h - Minimal implementation of software serial for Tasmota
 
-  Copyright (C) 2018 Theo Arends
+  Copyright (C) 2019 Theo Arends
 
   This library is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 /*********************************************************************************************\
  * TasmotaSerial supports up to 115200 baud with fixed buffer size of 64 bytes using optional no iram
  *
- * Based on EspSoftwareSerial v3.3.1 by Peter Lerup (https://github.com/plerup/espsoftwareserial)
+ * Based on EspSoftwareSerial v3.4.3 by Peter Lerup (https://github.com/plerup/espsoftwareserial)
 \*********************************************************************************************/
 
 #define TM_SERIAL_BAUDRATE           9600   // Default baudrate