diff --git a/README.md b/README.md
index 5ddba7cce..426ec8a34 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ## Sonoff-Tasmota
 Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE.
 
-Current version is **5.0.2** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/master/sonoff/_releasenotes.ino) for change information.
+Current version is **5.0.3** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/master/sonoff/_releasenotes.ino) for change information.
 
 ### **** ATTENTION Version 5.0.x specific information ****
 
diff --git a/api/arduino/sonoff.ino.bin b/api/arduino/sonoff.ino.bin
index 32ec27bc1..9360ad175 100644
Binary files a/api/arduino/sonoff.ino.bin and b/api/arduino/sonoff.ino.bin differ
diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino
index 46cf06d1c..ab895a282 100644
--- a/sonoff/_releasenotes.ino
+++ b/sonoff/_releasenotes.ino
@@ -1,4 +1,10 @@
-/* 5.0.2 20170503
+/* 5.0.3 20170504
+ * Add command SensorRetain on|off to enable retaining of mqtt message tele/sonoff/SENSOR (#74)
+ * Change WifiConfig timeout from 60 seconds to 180 seconds (#212)
+ * Change Sonoff Touch command Ledstate functionality by turning led on if power is off (#214)
+ * Add 4 seconds delay after power on before enabling button to workaround Wemos D1 mini RTS circuit (#380)
+ *
+ * 5.0.2 20170503
  * Reset SaveData, SaveState and MqttResponse to default values due to rearranging settings
  * Moved some settings to flag area
  * Add command TempUnit Celsius|Fahrenheit for selecting Celsius or Fahrenheit (#347)
diff --git a/sonoff/settings.h b/sonoff/settings.h
index d590b1ec7..62c5dce2e 100644
--- a/sonoff/settings.h
+++ b/sonoff/settings.h
@@ -12,7 +12,7 @@ typedef struct {
   uint32_t mqtt_button_retain : 1;
   uint32_t mqtt_switch_retain : 1;
   uint32_t temperature_conversion : 1;
-  uint32_t spare23 : 1;
+  uint32_t mqtt_sensor_retain : 1;
   uint32_t spare22 : 1;
   uint32_t spare21 : 1;
   uint32_t spare20 : 1;
diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino
index 78e498ea6..5969a5265 100644
--- a/sonoff/sonoff.ino
+++ b/sonoff/sonoff.ino
@@ -10,7 +10,7 @@
  * ====================================================
 */
 
-#define VERSION                0x05000200  // 5.0.2
+#define VERSION                0x05000300  // 5.0.3
 
 enum log_t   {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE, LOG_LEVEL_ALL};
 enum week_t  {Last, First, Second, Third, Fourth};
@@ -258,6 +258,7 @@ uint8_t holdcount = 0;                // Timer recording button hold
 uint8_t multiwindow = 0;              // Max time between button presses to record press count
 uint8_t multipress = 0;               // Number of button presses within multiwindow
 uint8_t lastwallswitch[4];            // Last wall switch states
+uint8_t blockgpio0 = 4;               // Block GPIO0 for 4 seconds after poweron to workaround Wemos D1 RTS circuit
 
 mytmplt my_module;                    // Active copy of GPIOs
 uint8_t pin[GPIO_MAX];                // Possible pin configurations
@@ -460,7 +461,7 @@ void mqtt_publish(const char* topic, const char* data)
   mqtt_publish(topic, data, false);
 }
 
-void mqtt_publish_topic_P(uint8_t prefix, const char* subtopic, const char* data)
+void mqtt_publish_topic_P(uint8_t prefix, const char* subtopic, const char* data, boolean retained)
 {
   char romram[16];
   char stopic[TOPSZ];  
@@ -468,7 +469,12 @@ void mqtt_publish_topic_P(uint8_t prefix, const char* subtopic, const char* data
   snprintf_P(romram, sizeof(romram), ((prefix > 3) && !sysCfg.flag.mqtt_response) ? PSTR("RESULT") : subtopic);
   prefix &= 1;
   snprintf_P(stopic, sizeof(stopic), PSTR("%s/%s/%s"), sysCfg.mqtt_prefix[prefix +1], sysCfg.mqtt_topic, romram);
-  mqtt_publish(stopic, data);
+  mqtt_publish(stopic, data, retained);
+}
+
+void mqtt_publish_topic_P(uint8_t prefix, const char* subtopic, const char* data)
+{
+  mqtt_publish_topic_P(prefix, subtopic, data, false);
 }
 
 void mqtt_publishPowerState(byte device)
@@ -793,6 +799,17 @@ boolean mqtt_command(boolean grpflg, char *type, uint16_t index, char *dataBuf,
     }
     snprintf_P(svalue, ssvalue, PSTR("{\"PowerRetain\":\"%s\"}"), getStateText(sysCfg.flag.mqtt_power_retain));
   }
+  else if (!strcmp_P(type,PSTR("SENSORRETAIN"))) {
+    if ((data_len > 0) && (payload >= 0) && (payload <= 1)) {
+      if (!payload) {
+        svalue[0] = '\0';
+        mqtt_publish_topic_P(1, PSTR("SENSOR"), svalue, sysCfg.flag.mqtt_sensor_retain);
+      }
+      sysCfg.flag.mqtt_sensor_retain = payload;
+    }
+    snprintf_P(svalue, ssvalue, PSTR("{\"SensorRetain\":\"%s\"}"), getStateText(sysCfg.flag.mqtt_sensor_retain));
+  }
+
 #ifdef USE_DOMOTICZ
   else if (domoticz_command(type, index, dataBuf, data_len, payload, svalue, ssvalue)) {
     // Serviced
@@ -1765,6 +1782,10 @@ void every_second()
 {
   char svalue[MESSZ];
 
+  if (blockgpio0) {
+    blockgpio0--;
+  }
+
   for (byte i = 0; i < MAX_PULSETIMERS; i++) {
     if (pulse_timer[i] > 111) {
       pulse_timer[i]--;
@@ -1849,7 +1870,7 @@ void every_second()
       svalue[0] = '\0';
       sensors_mqttPresent(svalue, sizeof(svalue), &djson);
       if (djson) {
-        mqtt_publish_topic_P(1, PSTR("SENSOR"), svalue);
+        mqtt_publish_topic_P(1, PSTR("SENSOR"), svalue, sysCfg.flag.mqtt_sensor_retain);
       }
 
       if (hlw_flg) {
@@ -1947,7 +1968,7 @@ void stateloop()
       button = NOT_PRESSED;
     }
   } else {
-    if (pin[GPIO_KEY1] < 99) {
+    if ((pin[GPIO_KEY1] < 99) && !blockgpio0) {
       button = digitalRead(pin[GPIO_KEY1]);
     }
   }
@@ -2067,7 +2088,7 @@ void stateloop()
       }
     } else {
       if (sysCfg.ledstate &0x01) {
-        setLed(power);
+        setLed((SONOFF_TOUCH == sysCfg.module) ? (power ^1) : power);
       }
     }
   }
diff --git a/sonoff/support.ino b/sonoff/support.ino
index 7f3b86dbf..ef192664e 100644
--- a/sonoff/support.ino
+++ b/sonoff/support.ino
@@ -176,8 +176,8 @@ boolean parseIP(uint32_t* addr, const char* str)
  * Wifi
 \*********************************************************************************************/
 
-#define WIFI_CONFIG_SEC   60   // seconds before restart
-#define WIFI_MANAGER_SEC  120  // seconds before restart
+#define WIFI_CONFIG_SEC   180  // seconds before restart
+#define WIFI_MANAGER_SEC  180  // seconds before restart
 #define WIFI_CHECK_SEC    20   // seconds
 #define WIFI_RETRY_SEC    30   // seconds