diff --git a/.travis.yml b/.travis.yml
index e51d282..99799a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ install:
   - wget https://github.com/z3t0/Arduino-IRremote/archive/2.1.0.zip -O /tmp/IRremote.zip
   - unzip /tmp/IRremote.zip -d /usr/local/share/arduino/libraries
   - rm -rf /usr/local/share/arduino/libraries/RobotIRremote
-  - wget https://github.com/markszabo/IRremoteESP8266/archive/v2.1.1.zip -O /tmp/IRremoteESP8266.zip 
+  - wget https://github.com/markszabo/IRremoteESP8266/archive/v2.2.0.zip -O /tmp/IRremoteESP8266.zip 
   - unzip /tmp/IRremoteESP8266.zip -d /usr/local/share/arduino/libraries
   - git clone https://github.com/ekstrand/ESP8266wifi /usr/local/share/arduino/libraries/ESP8266wifi
   - git clone https://github.com/1technophile/NewRemoteSwitch /usr/local/share/arduino/libraries/NewRemoteSwitch
diff --git a/ZgatewayIR.ino b/ZgatewayIR.ino
index d19e6ba..1a69293 100644
--- a/ZgatewayIR.ino
+++ b/ZgatewayIR.ino
@@ -62,8 +62,13 @@ boolean IRtoMQTT(){
     MQTTbits = String(results.bits);
     String rawCode = "";
     // Dump data
-    for (int i = 1;  i < results.rawlen;  i++) {
-      rawCode = rawCode + (results.rawbuf[i] * USECPERTICK);
+    for (uint16_t i = 1;  i < results.rawlen;  i++) {
+       #ifdef ESP8266
+          if (i % 100 == 0) yield();  // Preemptive yield every 100th entry to feed the WDT.
+          rawCode = rawCode + (results.rawbuf[i] * RAWTICK);
+       #else
+          rawCode = rawCode + (results.rawbuf[i] * USECPERTICK);
+       #endif
       if ( i < results.rawlen-1 ) rawCode = rawCode + ","; // ',' not needed on last one
     }
     trc(rawCode);
diff --git a/libraries/IRremote b/libraries/IRremote
index eb7a0be..20a4d97 160000
--- a/libraries/IRremote
+++ b/libraries/IRremote
@@ -1 +1 @@
-Subproject commit eb7a0bee7d3e3b5d8927dfc47138bb85bf486eb1
+Subproject commit 20a4d97f6178efdfcf421e92b3a4ca668d741d9e
diff --git a/libraries/IRremoteESP8266 b/libraries/IRremoteESP8266
index bad6676..9bc6dfb 160000
--- a/libraries/IRremoteESP8266
+++ b/libraries/IRremoteESP8266
@@ -1 +1 @@
-Subproject commit bad6676cae050cc8874768250be68b1c84c74ac6
+Subproject commit 9bc6dfb3e188c956310ccde8a90da773bcf995fa
diff --git a/libraries/NewRemoteSwitch b/libraries/NewRemoteSwitch
index 0e8e8ce..8eb980e 160000
--- a/libraries/NewRemoteSwitch
+++ b/libraries/NewRemoteSwitch
@@ -1 +1 @@
-Subproject commit 0e8e8ce25adc504986069bf4d5c95cea4fc2b4f1
+Subproject commit 8eb980ef6f88c3b660d14d51e266c99818bbff1b