diff --git a/docs/source/Plugin/P005_DHT11_DHT22.rst b/docs/source/Plugin/P005_DHT11_DHT22.rst
index 395ad28f2..a4bd6363a 100644
--- a/docs/source/Plugin/P005_DHT11_DHT22.rst
+++ b/docs/source/Plugin/P005_DHT11_DHT22.rst
@@ -104,6 +104,20 @@ Rules examples
 
 .. .. include:: P005_commands.repl
 
+How to patch Wemos DHT shield
+-----------------------------
+
+The Wemos DHT shield uses a pin which is also toggled at boot disrupting the connected DHT22 sensor.
+
+This causes the sensor to become unresponsive after a reboot.
+
+The DHT sensor needs to be connected to a configurable GPIO on the ESP module. 
+In case you have a simple ESP-01 module, it's best to use the GPIO-2 pin.
+
+See this `elaborate post on GitHub <https://github.com/letscontrolit/ESPEasy/issues/2569#issuecomment-688901549>`_ 
+describing the problem and how to patch the board to make it work like it should.
+
+
 Where to buy
 ------------
 
diff --git a/lib/HeatpumpIR/IRSender.h b/lib/HeatpumpIR/IRSender.h
index 60de0e7ef..6091d4537 100644
--- a/lib/HeatpumpIR/IRSender.h
+++ b/lib/HeatpumpIR/IRSender.h
@@ -6,7 +6,7 @@
 
 #include <Arduino.h>
 
-#ifdef ESP8266
+#if defined(ESP8266) || defined(ESP32)
 #include <IRsend.h>  // From IRremoteESP8266 library
 #include <stdint.h>
 #endif
@@ -75,7 +75,7 @@ class IRSenderESP32 : public IRSender
 };
 #endif
 
-#ifdef ESP8266
+#if defined(ESP8266) || defined(ESP32)
 class IRSenderIRremoteESP8266 : public IRSender
 {
   public:
@@ -113,4 +113,4 @@ class IRSenderESP8266Alt : public IRSender
 };
 #endif
 
-#endif
+#endif
\ No newline at end of file
diff --git a/lib/HeatpumpIR/IRSenderIRremoteESP8266.cpp b/lib/HeatpumpIR/IRSenderIRremoteESP8266.cpp
index a4ff60498..2ef24a9ce 100644
--- a/lib/HeatpumpIR/IRSenderIRremoteESP8266.cpp
+++ b/lib/HeatpumpIR/IRSenderIRremoteESP8266.cpp
@@ -1,5 +1,5 @@
 #include <Arduino.h>
-#ifdef ESP8266
+#if defined(ESP8266) || defined(ESP32)
 #include <IRSender.h>
 
 IRSenderIRremoteESP8266::IRSenderIRremoteESP8266(uint8_t pin) : IRSender(pin), _ir(pin) 
diff --git a/lib/HeatpumpIR/library.properties b/lib/HeatpumpIR/library.properties
index 3d21e0751..835228429 100644
--- a/lib/HeatpumpIR/library.properties
+++ b/lib/HeatpumpIR/library.properties
@@ -1,5 +1,5 @@
 name=HeatpumpIR
-version=1.0.15
+version=1.0.16
 author=Toni Arte<toni.arte@iki.fi>
 maintainer=Toni Arte<toni.arte@iki.fi>
 sentence=Heatpump / Air Conditioner infrared control
diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini
index 014dae841..a0c46fcbd 100644
--- a/platformio_esp32_envs.ini
+++ b/platformio_esp32_envs.ini
@@ -68,6 +68,12 @@ build_flags               = ${esp32_common.build_flags}
 board                     = lolin_d32_pro
 extra_scripts             = ${esp32_common.extra_scripts}
 
+[env:test_ESP32_IRExt_4M316k]
+extends                   = env:test_ESP32_4M316k
+lib_ignore                = AS_BH1750, ESP8266WiFi, ESP8266Ping, ESP8266WebServer, ESP8266HTTPUpdateServer, ESP8266mDNS, ESPEasy_ESP8266Ping, ESP32_ping
+build_flags               = ${esp32_common.build_flags}
+                            -DPLUGIN_BUILD_NORMAL_IRext
+
 ; Custom: 4096k version --------------------------
 [env:custom_ESP32_4M316k_ETH]
 extends                   = env:custom_ESP32_4M316k