diff --git a/README.md b/README.md
index 2b056a618..b69e027f3 100644
--- a/README.md
+++ b/README.md
@@ -177,7 +177,8 @@ The following devices are supported:
 - [iTead Sonoff SV](https://www.itead.cc/smart-home/sonoff-sv.html)<img src="https://github.com/arendst/arendst.github.io/blob/master/media/sonoff_th.jpg" width="250" align="right" />
 - [iTead Sonoff TH10/TH16 with temperature sensor](https://www.itead.cc/smart-home/sonoff-th.html)
 - [iTead Sonoff Dual (R2)](https://www.itead.cc/smart-home/sonoff-dual.html)
-- [iTead Sonoff Pow](https://www.itead.cc/smart-home/sonoff-pow.html)
+- [iTead Sonoff Pow with Energy Monitoring](https://www.itead.cc/smart-home/sonoff-pow.html)
+- [iTead Sonoff Pow R2 with Energy Monitoring](https://www.itead.cc/sonoff-pow-r2.html)
 - [iTead Sonoff 4CH](https://www.itead.cc/smart-home/sonoff-4ch.html)
 - [iTead Sonoff 4CH Pro](https://www.itead.cc/smart-home/sonoff-4ch-pro.html)
 - [iTead S20 Smart Socket](https://www.itead.cc/smart-socket.html)
diff --git a/platformio.ini b/platformio.ini
index 6f8b86e2c..c3d38b9a2 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -14,6 +14,7 @@ src_dir = sonoff
 ;env_default = sonoff
 ;env_default = sonoff-minimal
 ;env_default = sonoff-xxl
+;env_default = sonoff-BG
 ;env_default = sonoff-CZ
 ;env_default = sonoff-DE
 ;env_default = sonoff-ES
@@ -98,6 +99,20 @@ extra_scripts = pio/strip-floats.py
 ; *** Serial Monitor options
 monitor_baud = 115200
 
+[env:sonoff-BG]
+;platform = espressif8266@1.5.0  ; v2.3.0
+;platform = espressif8266@1.6.0  ; v2.4.0
+platform = espressif8266
+framework = arduino
+board = esp01_1m
+board_flash_mode = dout
+build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=bg-BG
+;build_flags = -Wl,-Tesp8266.flash.1m0.ld -DMY_LANGUAGE=bg-BG -DUSE_CONFIG_OVERRIDE
+extra_scripts = pio/strip-floats.py
+
+; *** Serial Monitor options
+monitor_baud = 115200
+
 [env:sonoff-DE]
 ;platform = espressif8266@1.5.0  ; v2.3.0
 ;platform = espressif8266@1.6.0  ; v2.4.0
diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino
index c9cd7fef3..1c2269538 100644
--- a/sonoff/_releasenotes.ino
+++ b/sonoff/_releasenotes.ino
@@ -3,7 +3,10 @@
  * Add random window to timers (#2447)
  * Add optional KNX IP Protocol Support (#2402)
  * Add Greek language file (#2491)
- * Fix compile error when using ESP/Arduino library v2.3.0 by reverting KNX async UDP library to default UDP library (#2488,#2492,#2493)
+ * Add Bulgarian language file
+ * Add support for sensor HC-SR04 ultrasonic (#113, #1964, #2444)
+ * Add support for Sonoff Pow R2 (#2340)
+ * Fix compile error when using ESP/Arduino library v2.3.0 by reverting KNX async UDP library to default UDP library (#2488, #2492, #2493)
  * Fix configuration filename truncation when it contains spaces (#2484, #2490)
  *
  * 5.12.0l
diff --git a/sonoff/i18n.h b/sonoff/i18n.h
index 2820ae0de..fc6a43db4 100644
--- a/sonoff/i18n.h
+++ b/sonoff/i18n.h
@@ -46,6 +46,7 @@
 #define D_JSON_COUNTER "Counter"
 #define D_JSON_CURRENT "Current"         // As in Voltage and Current
 #define D_JSON_DATA "Data"
+#define D_JSON_DISTANCE "Distance"
 #define D_JSON_DNSSERVER "DNSServer"
 #define D_JSON_DONE "Done"
 #define D_JSON_ECO2 "eCO2"
diff --git a/sonoff/language/bg-BG.h b/sonoff/language/bg-BG.h
new file mode 100644
index 000000000..29391e192
--- /dev/null
+++ b/sonoff/language/bg-BG.h
@@ -0,0 +1,505 @@
+/*
+  bg-BG.h - localization for Bulgaria - Bulgarian for Sonoff-Tasmota
+
+  Copyright (C) 2018  Theo Arends
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _LANGUAGE_BG_BG_H_
+#define _LANGUAGE_BG_BG_H_
+
+/*************************** ATTENTION *******************************\
+ *
+ * Due to memory constraints only UTF-8 is supported.
+ * To save code space keep text as short as possible.
+ * Time and Date provided by SDK can not be localized (yet).
+ * Use online command StateText to translate ON, OFF, HOLD and TOGGLE.
+ * Use online command Prefix to translate cmnd, stat and tele.
+ *
+ * Updated until v5.12.0l
+\*********************************************************************/
+
+//#define LANGUAGE_MODULE_NAME         // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English)
+
+// HTML (ISO 639-1) Language Code
+#define D_HTML_LANGUAGE "bg"
+
+// "2017-03-07T11:08:02" - ISO8601:2004
+#define D_YEAR_MONTH_SEPARATOR "-"
+#define D_MONTH_DAY_SEPARATOR "-"
+#define D_DATE_TIME_SEPARATOR "T"
+#define D_HOUR_MINUTE_SEPARATOR ":"
+#define D_MINUTE_SECOND_SEPARATOR ":"
+
+#define D_DAY3LIST "НедПонВтрСрдЧетПетСъб"
+#define D_MONTH3LIST "ЯнуФевМарАпрМайЮниЮлиАвгСепОктНоеДек"
+
+// Non JSON decimal separator
+#define D_DECIMAL_SEPARATOR ","
+
+// Common
+#define D_ADMIN "Admin"
+#define D_AIR_QUALITY "Качество на въздуха"
+#define D_AP "Точка за достъп"                    // Access Point
+#define D_AS "като"
+#define D_AUTO "АВТОМАТИЧНО"
+#define D_BLINK "Мигане вкл."
+#define D_BLINKOFF "Мигане изкл."
+#define D_BOOT_COUNT "Брой на стартиранията"
+#define D_BRIGHTLIGHT "Яркост"
+#define D_BUTTON "Бутон"
+#define D_BY "от"                    // Written by me
+#define D_BYTES "Байт"
+#define D_CELSIUS "Целзий"
+#define D_CO2 "Въглероден диоксид"
+#define D_CODE "код"                // Button code
+#define D_COLDLIGHT "Хладна"
+#define D_COMMAND "Команда"
+#define D_CONNECTED "Свързан"
+#define D_COUNT "Брой"
+#define D_COUNTER "Брояч"
+#define D_CURRENT "Ток"          // As in Voltage and Current
+#define D_DATA "Данни"
+#define D_DARKLIGHT "Тъмна"
+#define D_DEBUG "Дебъгване"
+#define D_DISABLED "Деактивиран"
+#define D_DISTANCE "Distance"
+#define D_DNS_SERVER "DNS Сървър"
+#define D_DONE "Изпълнено"
+#define D_DST_TIME "DST"
+#define D_ECO2 "eCO2"
+#define D_EMULATION "Емулация"
+#define D_ENABLED "Активиран"
+#define D_ERASE "Изтриване"
+#define D_ERROR "Грешка"
+#define D_FAHRENHEIT "Фаренхайт"
+#define D_FAILED "Неуспешно"
+#define D_FALLBACK "Обратна връзка"
+#define D_FALLBACK_TOPIC "Топик на обратната връзка"
+#define D_FALSE "Невярно"
+#define D_FILE "Файл"
+#define D_FREE_MEMORY "Свободна памет"
+#define D_GAS "Газ"
+#define D_GATEWAY "Шлюз"
+#define D_GROUP "Група"
+#define D_HOST "Хост"
+#define D_HOSTNAME "Име на хоста"
+#define D_HUMIDITY "Влажност"
+#define D_ILLUMINANCE "Осветеност"
+#define D_IMMEDIATE "моментален"      // Button immediate
+#define D_INDEX "Индекс"
+#define D_INFO "Информация"
+#define D_INITIALIZED "Инициализирано"
+#define D_IP_ADDRESS "IP адрес"
+#define D_LIGHT "Светлина"
+#define D_LWT "LWT"
+#define D_MODULE "Модул"
+#define D_MQTT "MQTT"
+#define D_MULTI_PRESS "многократно натискане"
+#define D_NOISE "Шум"
+#define D_NONE "Няма"
+#define D_OFF "Изкл."
+#define D_OFFLINE "Офлайн"
+#define D_OK "Ок"
+#define D_ON "Вкл."
+#define D_ONLINE "Онлайн"
+#define D_PASSWORD "Парола"
+#define D_PORT "Порт"
+#define D_POWER_FACTOR "Фактор на мощността"
+#define D_POWERUSAGE "Мощност"
+#define D_PRESSURE "Налягане"
+#define D_PRESSUREATSEALEVEL "Налягане на морското ниво"
+#define D_PROGRAM_FLASH_SIZE "Размер на флаш паметта за програми"
+#define D_PROGRAM_SIZE "Размер на програмата"
+#define D_PROJECT "Проект"
+#define D_RECEIVED "Получено"
+#define D_RESTART "Рестарт"
+#define D_RESTARTING "Рестартиране"
+#define D_RESTART_REASON "Причина за рестарта"
+#define D_RESTORE "възстановяване"
+#define D_RETAINED "запазено"
+#define D_RULE "Правило"
+#define D_SAVE "Запис"
+#define D_SENSOR "Датчик"
+#define D_SSID "SSId"
+#define D_START "Старт"
+#define D_STD_TIME "STD"
+#define D_STOP "Стоп"
+#define D_SUBNET_MASK "Маска на подмрежата"
+#define D_SUBSCRIBE_TO "Записване за"
+#define D_SUCCESSFUL "Успешно"
+#define D_SUNRISE "Изгрев"
+#define D_SUNSET "Залез"
+#define D_TEMPERATURE "Температура"
+#define D_TO "към"
+#define D_TOGGLE "Превключване"
+#define D_TOPIC "Топик"
+#define D_TRANSMIT "Предаване"
+#define D_TRUE "Вярно"
+#define D_TVOC "TVOC"
+#define D_UPGRADE "Обновяване"
+#define D_UPLOAD "Зареждане"
+#define D_UPTIME "Време от стартирането"
+#define D_USER "Потребител"
+#define D_UTC_TIME "UTC"
+#define D_UV_LEVEL "Ниво на ултравиолетово излъчване"
+#define D_VERSION "Версия"
+#define D_VOLTAGE "Напрежение"
+#define D_WARMLIGHT "Топла"
+#define D_WEB_SERVER "Уеб сървър"
+
+// sonoff.ino
+#define D_WARNING_MINIMAL_VERSION "ПРЕДУПРЕЖДЕНИЕ Тази версия не поддържа постоянни настройки"
+#define D_LEVEL_10 "ниво 1-0"
+#define D_LEVEL_01 "ниво 0-1"
+#define D_SERIAL_LOGGING_DISABLED "Серийния логинг изключен"
+#define D_SYSLOG_LOGGING_REENABLED "Системния логинг активиран"
+
+#define D_SET_BAUDRATE_TO "Задаване скорост на предаване (Baudrate)"
+#define D_RECEIVED_TOPIC "Получен топик"
+#define D_DATA_SIZE "Размер на данните"
+#define D_ANALOG_INPUT "Аналогов вход"
+
+// support.ino
+#define D_OSWATCH "osWatch"
+#define D_BLOCKED_LOOP "Блокиран цикъл"
+#define D_WPS_FAILED_WITH_STATUS "WPS конфигурацията е НЕУСПЕШНА със статус"
+#define D_ACTIVE_FOR_3_MINUTES "активно в течение на 3 минути"
+#define D_FAILED_TO_START "неуспешно стартиране"
+#define D_PATCH_ISSUE_2186 "Проблем с патч 2186"
+#define D_CONNECTING_TO_AP "Свързване към точка за достъп"
+#define D_IN_MODE "в режим"
+#define D_CONNECT_FAILED_NO_IP_ADDRESS "Грешка при свързването, не е получен IP адрес"
+#define D_CONNECT_FAILED_AP_NOT_REACHED "Грешка при свързването, точката за достъп е недостижима"
+#define D_CONNECT_FAILED_WRONG_PASSWORD "Грешка при свързването, грешна парола към точката за достъп"
+#define D_CONNECT_FAILED_AP_TIMEOUT "Грешка при свързването, превишено време за изчакване"
+#define D_ATTEMPTING_CONNECTION "Опитва свързване..."
+#define D_CHECKING_CONNECTION "Проверка на свързването..."
+#define D_QUERY_DONE "Запитването е изпълнено. Намерена е услуга MQTT"
+#define D_MQTT_SERVICE_FOUND "MQTT услуга е намерена на"
+#define D_FOUND_AT "намерена в"
+#define D_SYSLOG_HOST_NOT_FOUND "Хостът на системния лог не е намерен"
+
+// settings.ino
+#define D_SAVED_TO_FLASH_AT "Запазено в флаш паметта на"
+#define D_LOADED_FROM_FLASH_AT "Заредено от флаш паметта от"
+#define D_USE_DEFAULTS "Използване на параметри по подразбиране"
+#define D_ERASED_SECTOR "Изтрит сектор"
+
+// webserver.ino
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Фърмуеър MINIMAL - моля надградете го"
+#define D_WEBSERVER_ACTIVE_ON "Уеб сървърът е активен на"
+#define D_WITH_IP_ADDRESS "с IP адрес"
+#define D_WEBSERVER_STOPPED "Уеб сървърът е спрян"
+#define D_FILE_NOT_FOUND "Файлът не е намерен"
+#define D_REDIRECTED "Пренасочено към адаптивния портал"
+#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wifi мениджърът настройва точка за достъп и запомня станцията"
+#define D_WIFIMANAGER_SET_ACCESSPOINT "Wifi мениджърът настрои точката за достъп"
+#define D_TRYING_TO_CONNECT "Опит за свързване на устройството към мрежата"
+
+#define D_RESTART_IN "Рестарт след"
+#define D_SECONDS "секунди"
+#define D_DEVICE_WILL_RESTART "Устройството ще се рестартира след няколко секунди"
+#define D_BUTTON_TOGGLE "Превключване"
+#define D_CONFIGURATION "Конфигурация"
+#define D_INFORMATION "Информация"
+#define D_FIRMWARE_UPGRADE "Обновяване на фърмуеъра"
+#define D_CONSOLE "Конзола"
+#define D_CONFIRM_RESTART "Подтвърдете рестартирането"
+
+#define D_CONFIGURE_MODULE "Конфигурация на модула"
+#define D_CONFIGURE_WIFI "Конфигурация на WiFi"
+#define D_CONFIGURE_MQTT "Конфигурация на MQTT"
+#define D_CONFIGURE_DOMOTICZ "Конфигурация на Domoticz"
+#define D_CONFIGURE_LOGGING "Конфигурация на логинга"
+#define D_CONFIGURE_OTHER "Конфигурация на други"
+#define D_CONFIRM_RESET_CONFIGURATION "Потвърдете ресетирането"
+#define D_RESET_CONFIGURATION "Ресетиране на конфигурацията"
+#define D_BACKUP_CONFIGURATION "Запазване на конфигурацията"
+#define D_RESTORE_CONFIGURATION "Възстановяване на конфигурацията"
+#define D_MAIN_MENU "Основно Меню"
+
+#define D_MODULE_PARAMETERS "Параметри на модула"
+#define D_MODULE_TYPE "Тип на модула"
+#define D_GPIO "GPIO"
+#define D_SERIAL_IN "Сериен вход"
+#define D_SERIAL_OUT "Сериен изход"
+
+#define D_WIFI_PARAMETERS "Параметры на Wifi"
+#define D_SCAN_FOR_WIFI_NETWORKS "Сканиране за безжични мрежи Wifi"
+#define D_SCAN_DONE "Сканированието е завършено"
+#define D_NO_NETWORKS_FOUND "Не са намерени мрежи"
+#define D_REFRESH_TO_SCAN_AGAIN "Обновяване за повторно сканиране"
+#define D_DUPLICATE_ACCESSPOINT "Дублиране на точката за достъп (AP)"
+#define D_SKIPPING_LOW_QUALITY "Пропускане поради лошо качество"
+#define D_RSSI "RSSI"
+#define D_WEP "WEP"
+#define D_WPA_PSK "WPA PSK"
+#define D_WPA2_PSK "WPA2 PSK"
+#define D_AP1_SSID "AP1 SSId"
+#define D_AP1_PASSWORD "AP1 Парола"
+#define D_AP2_SSID "AP2 SSId"
+#define D_AP2_PASSWORD "AP2 Парола"
+
+#define D_MQTT_PARAMETERS "Параметри на MQTT"
+#define D_CLIENT "Клиент"
+#define D_FULL_TOPIC "Пълен топик"
+
+#define D_LOGGING_PARAMETERS "Параметри на логинга"
+#define D_SERIAL_LOG_LEVEL "Степен на серийния лог"
+#define D_WEB_LOG_LEVEL "Степен на Уеб лога"
+#define D_SYS_LOG_LEVEL "Степен на системния лог"
+#define D_MORE_DEBUG "Още дебъгване"
+#define D_SYSLOG_HOST "Хост на системния лог"
+#define D_SYSLOG_PORT "Порт на системния лог"
+#define D_TELEMETRY_PERIOD "Период на телеметрия"
+
+#define D_OTHER_PARAMETERS "Други параметри"
+#define D_WEB_ADMIN_PASSWORD "Парола на уеб администратора"
+#define D_MQTT_ENABLE "активиране на MQTT"
+#define D_FRIENDLY_NAME "приятелско име"
+#define D_BELKIN_WEMO "Belkin WeMo"
+#define D_HUE_BRIDGE "Hue Bridge"
+#define D_SINGLE_DEVICE "единично"
+#define D_MULTI_DEVICE "мулти"
+
+#define D_SAVE_CONFIGURATION "Запазване на конфигурацията"
+#define D_CONFIGURATION_SAVED "Конфигурацията е запазена"
+#define D_CONFIGURATION_RESET "Конфигурацията е изчистена"
+
+#define D_PROGRAM_VERSION "Версия на програмата"
+#define D_BUILD_DATE_AND_TIME "Дата & Час на компилацията"
+#define D_CORE_AND_SDK_VERSION "Версия на Core/SDK"
+#define D_FLASH_WRITE_COUNT "Брой на записите във Flash"
+#define D_MAC_ADDRESS "MAC адрес"
+#define D_MQTT_HOST "MQTT хост"
+#define D_MQTT_PORT "MQTT порт"
+#define D_MQTT_CLIENT "MQTT ID на клиент"
+#define D_MQTT_USER "MQTT потребител"
+#define D_MQTT_TOPIC "MQTT топик"
+#define D_MQTT_GROUP_TOPIC "MQTT групов топик"
+#define D_MQTT_FULL_TOPIC "MQTT пълен топик"
+#define D_MDNS_DISCOVERY "mDNS откриване"
+#define D_MDNS_ADVERTISE "mDNS транслация"
+#define D_ESP_CHIP_ID "ID на чипа ESP"
+#define D_FLASH_CHIP_ID "ID на чипа на флаш паметта"
+#define D_FLASH_CHIP_SIZE "Размер на флаш паметта"
+#define D_FREE_PROGRAM_SPACE "Свободно пространство за програми"
+
+#define D_UPGRADE_BY_WEBSERVER "Обновяване чрез уеб сървър"
+#define D_OTA_URL "OTA Url"
+#define D_START_UPGRADE "Започване на обновяване"
+#define D_UPGRADE_BY_FILE_UPLOAD "Обновяване чрез зареждане на файл"
+#define D_UPLOAD_STARTED "Зареждането започна"
+#define D_UPGRADE_STARTED "Обновяването започна"
+#define D_UPLOAD_DONE "Зареждането завърши"
+#define D_UPLOAD_ERR_1 "Не е избран файл"
+#define D_UPLOAD_ERR_2 "Недостатъчно свободно място"
+#define D_UPLOAD_ERR_3 "Magic байтът не е 0xE9"
+#define D_UPLOAD_ERR_4 "Размерът на програмата е по-голям от реалния размер на флаш паметта"
+#define D_UPLOAD_ERR_5 "Грешка при зареждането в буфера"
+#define D_UPLOAD_ERR_6 "Грешка пр зареждането. Включено е ниво 3 на лога"
+#define D_UPLOAD_ERR_7 "Зареждането е прекъснато"
+#define D_UPLOAD_ERR_8 "Файлът е невалиден"
+#define D_UPLOAD_ERR_9 "Файлът е прекалено голям"
+#define D_UPLOAD_ERROR_CODE "Код на грешка при зареждането"
+
+#define D_ENTER_COMMAND "Въвеждане на команда"
+#define D_ENABLE_WEBLOG_FOR_RESPONSE "Включете ниво 2 на лога, ако очаквате отговор"
+#define D_NEED_USER_AND_PASSWORD "Очаква user=<username>&password=<password>"
+
+// xdrv_00_mqtt.ino
+#define D_FINGERPRINT "Проверка на TLS отпечатък..."
+#define D_TLS_CONNECT_FAILED_TO "Неуспешно TLS свързване към"
+#define D_RETRY_IN "Повторно след"
+#define D_VERIFIED "Проверен отпечтък"
+#define D_INSECURE "Нешифрована връзка, недействителен отпечатък"
+#define D_CONNECT_FAILED_TO "Грешка при свързването към"
+
+// xdrv_wemohue.ino
+#define D_MULTICAST_DISABLED "Multicast е изключен"
+#define D_MULTICAST_REJOINED "Multicast е повторно съединен"
+#define D_MULTICAST_JOIN_FAILED "Multicast грешка при присъединяването"
+#define D_FAILED_TO_SEND_RESPONSE "Не се получи изпращането на отговор"
+
+#define D_WEMO "WeMo"
+#define D_WEMO_BASIC_EVENT "WeMo главно събитие"
+#define D_WEMO_EVENT_SERVICE "WeMo услуга за събитията"
+#define D_WEMO_META_SERVICE "WeMo мета-услуга"
+#define D_WEMO_SETUP "WeMo настройка"
+#define D_RESPONSE_SENT "Отговорът е изпратен"
+
+#define D_HUE "Hue"
+#define D_HUE_BRIDGE_SETUP "Hue мост настройка"
+#define D_HUE_API_NOT_IMPLEMENTED "Hue API не е внедрено"
+#define D_HUE_API "Hue API"
+#define D_HUE_POST_ARGS "Hue POST аргументи"
+#define D_3_RESPONSE_PACKETS_SENT "Изпратени са 3 пакета за отговор"
+
+// xdrv_05_domoticz.ino
+#define D_DOMOTICZ_PARAMETERS "Domoticz параметри"
+#define D_DOMOTICZ_IDX "Idx"
+#define D_DOMOTICZ_KEY_IDX "Key idx"
+#define D_DOMOTICZ_SWITCH_IDX "Switch idx"
+#define D_DOMOTICZ_SENSOR_IDX "Sensor idx"
+  #define D_DOMOTICZ_TEMP "Temp"
+  #define D_DOMOTICZ_TEMP_HUM "Temp,Hum"
+  #define D_DOMOTICZ_TEMP_HUM_BARO "Temp,Hum,Baro"
+  #define D_DOMOTICZ_POWER_ENERGY "Power,Energy"
+  #define D_DOMOTICZ_ILLUMINANCE "Illuminance"
+  #define D_DOMOTICZ_COUNT "Count/PM1"
+  #define D_DOMOTICZ_VOLTAGE "Voltage/PM2,5"
+  #define D_DOMOTICZ_CURRENT "Current/PM10"
+  #define D_DOMOTICZ_AIRQUALITY "AirQuality"
+#define D_DOMOTICZ_UPDATE_TIMER "Update timer"
+
+// xdrv_09_timers.ino
+#define D_CONFIGURE_TIMER "Конфигуриране на таймер"
+#define D_TIMER_PARAMETERS "Параметри на таймера"
+#define D_TIMER_ARM "Arm"
+#define D_TIMER_TIME "Time"
+#define D_TIMER_DAYS "Days"
+#define D_TIMER_REPEAT "Repeat"
+#define D_TIMER_OUTPUT "Output"
+#define D_TIMER_ACTION "Action"
+
+// xdrv_10_knx.ino
+#define D_CONFIGURE_KNX "Configure KNX"
+#define D_KNX_PARAMETERS "KNX Parameters"
+#define D_KNX_GENERAL_CONFIG "General"
+#define D_KNX_PHYSICAL_ADDRESS "Physical Address"
+#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )"
+#define D_KNX_ENABLE "Enable KNX"
+#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses"
+#define D_ADD "Add"
+#define D_DELETE "Delete"
+#define D_REPLY "Reply"
+#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from"
+#define D_LOG_KNX "KNX: "
+#define D_RECEIVED_FROM "Received from"
+#define D_KNX_COMMAND_WRITE "Write"
+#define D_KNX_COMMAND_READ "Read"
+#define D_KNX_COMMAND_OTHER "Other"
+#define D_SENT_TO "sent to"
+#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used."
+
+// xdrv_03_energy.ino
+#define D_ENERGY_TODAY "Използвана енергия днес"
+#define D_ENERGY_YESTERDAY "Използвана енергия вчера"
+#define D_ENERGY_TOTAL "Използвана енергия общо"
+
+// xsns_05_ds18b20.ino
+#define D_SENSOR_BUSY "Датчикът DS18x20 е зает"
+#define D_SENSOR_CRC_ERROR "Датчик DS18x20 - грешка CRC"
+#define D_SENSORS_FOUND "Намерен е датчик DS18x20"
+
+// xsns_06_dht.ino
+#define D_TIMEOUT_WAITING_FOR "Изтекло време за очакване на"
+#define D_START_SIGNAL_LOW "стартов сигнал нисък"
+#define D_START_SIGNAL_HIGH "стартов сигнал висок"
+#define D_PULSE "импулс"
+#define D_CHECKSUM_FAILURE "Грешка в контролната сума"
+
+// xsns_07_sht1x.ino
+#define D_SENSOR_DID_NOT_ACK_COMMAND "Датчикът не прие команда ACK"
+#define D_SHT1X_FOUND "Намерен е SHT1X"
+
+// xsns_18_pms5003.ino
+#define D_STANDARD_CONCENTRATION "CF-1 PM"     // Standard Particle CF-1 Particle Matter
+#define D_ENVIRONMENTAL_CONCENTRATION "PM"     // Environmetal Particle Matter
+#define D_PARTICALS_BEYOND "Particals"
+
+// sonoff_template.h
+#define D_SENSOR_NONE     "няма"
+#define D_SENSOR_DHT11    "DHT11"
+#define D_SENSOR_AM2301   "AM2301"
+#define D_SENSOR_SI7021   "SI7021"
+#define D_SENSOR_DS18X20  "DS18x20"
+#define D_SENSOR_I2C_SCL  "I2C SCL"
+#define D_SENSOR_I2C_SDA  "I2C SDA"
+#define D_SENSOR_WS2812   "WS2812"
+#define D_SENSOR_IRSEND   "IRsend"
+#define D_SENSOR_SWITCH   "Ключ"   // Suffix "1"
+#define D_SENSOR_BUTTON   "Бутон"   // Suffix "1"
+#define D_SENSOR_RELAY    "Реле"    // Suffix "1i"
+#define D_SENSOR_LED      "Led"      // Suffix "1i"
+#define D_SENSOR_PWM      "PWM"      // Suffix "1"
+#define D_SENSOR_COUNTER  "Брояч"  // Suffix "1"
+#define D_SENSOR_IRRECV   "IRrecv"
+#define D_SENSOR_MHZ_RX   "MHZ Rx"
+#define D_SENSOR_MHZ_TX   "MHZ Tx"
+#define D_SENSOR_PZEM_RX  "PZEM Rx"
+#define D_SENSOR_PZEM_TX  "PZEM Tx"
+#define D_SENSOR_SAIR_RX  "SAir Rx"
+#define D_SENSOR_SAIR_TX  "SAir Tx"
+#define D_SENSOR_SPI_CS   "SPI CS"
+#define D_SENSOR_SPI_DC   "SPI DC"
+#define D_SENSOR_BACKLIGHT "BkLight"
+#define D_SENSOR_PMS5003  "PMS5003"
+#define D_SENSOR_SDS0X1   "SDS0X1"
+#define D_SENSOR_SBR_RX   "SerBr Rx"
+#define D_SENSOR_SBR_TX   "SerBr Tx"
+#define D_SENSOR_SR04_TRIG "SR04 Tri"
+#define D_SENSOR_SR04_ECHO "SR04 Ech"
+
+// Units
+#define D_UNIT_AMPERE "А"
+#define D_UNIT_CENTIMETER "cm"
+#define D_UNIT_HOUR "Ч"
+#define D_UNIT_KILOOHM "кОм"
+#define D_UNIT_KILOWATTHOUR "кВт"
+#define D_UNIT_LUX "лукс"
+#define D_UNIT_MICROGRAM_PER_CUBIC_METER "микрограм/м3"
+#define D_UNIT_MICROMETER "микрметър"
+#define D_UNIT_MICROSECOND "микросек."
+#define D_UNIT_MILLIAMPERE "мА"
+#define D_UNIT_MILLISECOND "милисек."
+#define D_UNIT_MINUTE "мин."
+#define D_UNIT_PARTS_PER_BILLION "ppb"
+#define D_UNIT_PARTS_PER_DECILITER "ppd"
+#define D_UNIT_PARTS_PER_MILLION "ppm"
+#define D_UNIT_PRESSURE "Хектопаскал"
+#define D_UNIT_SECOND "сек."
+#define D_UNIT_SECTORS "сектори"
+#define D_UNIT_VOLT "В"
+#define D_UNIT_WATT "Вт"
+#define D_UNIT_WATTHOUR "Вт/Час"
+
+// Log message prefix
+#define D_LOG_APPLICATION "APP: "  // Application
+#define D_LOG_BRIDGE "BRG: "       // Bridge
+#define D_LOG_CONFIG "CFG: "       // Settings
+#define D_LOG_COMMAND "CMD: "      // Command
+#define D_LOG_DEBUG "DBG: "        // Debug
+#define D_LOG_DHT "DHT: "          // DHT sensor
+#define D_LOG_DOMOTICZ "DOM: "     // Domoticz
+#define D_LOG_DSB "DSB: "          // DS18xB20 sensor
+#define D_LOG_HTTP "HTP: "         // HTTP webserver
+#define D_LOG_I2C "I2C: "          // I2C
+#define D_LOG_IRR "IRR: "          // Infra Red Received
+#define D_LOG_LOG "LOG: "          // Logging
+#define D_LOG_MODULE "MOD: "       // Module
+#define D_LOG_MDNS "DNS: "         // mDNS
+#define D_LOG_MQTT "MQT: "         // MQTT
+#define D_LOG_OTHER "OTH: "        // Other
+#define D_LOG_RESULT "RSL: "       // Result
+#define D_LOG_RFR "RFR: "          // RF Received
+#define D_LOG_SERIAL "SER: "       // Serial
+#define D_LOG_SHT1 "SHT: "         // SHT1x sensor
+#define D_LOG_UPLOAD "UPL: "       // Upload
+#define D_LOG_UPNP "UPP: "         // UPnP
+#define D_LOG_WIFI "WIF: "         // Wifi
+
+#endif  // _LANGUAGE_BG_BG_H_
diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h
index e5ad4bee3..fa641216d 100644
--- a/sonoff/language/cs-CZ.h
+++ b/sonoff/language/cs-CZ.h
@@ -1,7 +1,7 @@
 /*
   cs-CZ.h - localization for Czech with diacritics - Czech for Sonoff-Tasmota
 
-  Copyright (C) 2018  Theo Arends (translated by vs)
+  Copyright (C) 2018  Vladimír Synekl
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
  * Use online command StateText to translate ON, OFF, HOLD and TOGGLE.
  * Use online command Prefix to translate cmnd, stat and tele.
  *
- * Updated until v5.12.0k
+ * Updated until v5.12.0m
 \*********************************************************************/
 
 //#define LANGUAGE_MODULE_NAME         // Enable to display "Module Generic" (ie Spanish), Disable to display "Generic Module" (ie English)
@@ -57,7 +57,7 @@
 #define D_AUTO "AUTO"
 #define D_BLINK "Blikání"
 #define D_BLINKOFF "BlikáníVyp"
-#define D_BOOT_COUNT "Počitadlo spuštění"
+#define D_BOOT_COUNT "Počítadlo spuštění"
 #define D_BRIGHTLIGHT "Světlý"
 #define D_BUTTON "Tlačítko"
 #define D_BY "by"                    // Written by me
@@ -69,12 +69,13 @@
 #define D_COMMAND "Příkaz"
 #define D_CONNECTED "...připojeno"
 #define D_COUNT "Počítej"
-#define D_COUNTER "Počitadlo"
+#define D_COUNTER "Počítadlo"
 #define D_CURRENT "Proud"          // As in Voltage and Current
 #define D_DATA "Data"
 #define D_DARKLIGHT "Tmavý"
 #define D_DEBUG "Debug"
 #define D_DISABLED "Zablokováno"
+#define D_DISTANCE "Distance"
 #define D_DNS_SERVER "Server DNS"
 #define D_DONE "Provedeno"
 #define D_DST_TIME "DST"
@@ -116,7 +117,7 @@
 #define D_ONLINE "Aktivní"
 #define D_PASSWORD "Heslo"
 #define D_PORT "Port"
-#define D_POWER_FACTOR "Součinitel příkonu"
+#define D_POWER_FACTOR "Účiník"
 #define D_POWERUSAGE "Příkon"
 #define D_PRESSURE "Tlak"
 #define D_PRESSUREATSEALEVEL "Tlak na úrovni hladiny moře"
@@ -375,24 +376,24 @@
 #define D_TIMER_ACTION "Napájení"
 
 // xdrv_10_knx.ino
-#define D_CONFIGURE_KNX "Configure KNX"
-#define D_KNX_PARAMETERS "KNX Parameters"
-#define D_KNX_GENERAL_CONFIG "General"
-#define D_KNX_PHYSICAL_ADDRESS "Physical Address"
-#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Must be unique on the KNX network )"
-#define D_KNX_ENABLE "Enable KNX"
-#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data to Send to Group Addresses"
-#define D_ADD "Add"
-#define D_DELETE "Delete"
-#define D_REPLY "Reply"
-#define D_KNX_GROUP_ADDRESS_TO_READ "Group Addresses to Receive Data from"
+#define D_CONFIGURE_KNX "Nastavení KNX"
+#define D_KNX_PARAMETERS "KNX parametry"
+#define D_KNX_GENERAL_CONFIG "Obecné"
+#define D_KNX_PHYSICAL_ADDRESS "Fyzická adresa"
+#define D_KNX_PHYSICAL_ADDRESS_NOTE "( Musí být jedinečná v síti KNX )"
+#define D_KNX_ENABLE "Povol KNX"
+#define D_KNX_GROUP_ADDRESS_TO_WRITE "Data k odeslání na skupinové adresy"
+#define D_ADD "Přidej"
+#define D_DELETE "Smaž"
+#define D_REPLY "Odpověď"
+#define D_KNX_GROUP_ADDRESS_TO_READ "Skupinové adresy pro příjem dat z"
 #define D_LOG_KNX "KNX: "
-#define D_RECEIVED_FROM "Received from"
-#define D_KNX_COMMAND_WRITE "Write"
-#define D_KNX_COMMAND_READ "Read"
-#define D_KNX_COMMAND_OTHER "Other"
-#define D_SENT_TO "sent to"
-#define D_KNX_WARNING "The group address ( 0 / 0 / 0 ) is reserved and can not be used."
+#define D_RECEIVED_FROM "Přijato z"
+#define D_KNX_COMMAND_WRITE "Zapiš"
+#define D_KNX_COMMAND_READ "Čti"
+#define D_KNX_COMMAND_OTHER "Jiné"
+#define D_SENT_TO "pošli"
+#define D_KNX_WARNING "Skupinová adresa ( 0 / 0 / 0 ) je rezervována a nemůže být použita."
 
 // xdrv_03_energy.ino
 #define D_ENERGY_TODAY "Spotřeba Dnes"
@@ -435,7 +436,7 @@
 #define D_SENSOR_RELAY    "Relé"    // Suffix "1i"
 #define D_SENSOR_LED      "Led"      // Suffix "1i"
 #define D_SENSOR_PWM      "PWM"      // Suffix "1",
-#define D_SENSOR_COUNTER  "Počitadlo"  // Suffix "1"
+#define D_SENSOR_COUNTER  "Počítadlo"  // Suffix "1"
 #define D_SENSOR_IRRECV   "IRrecv"
 #define D_SENSOR_MHZ_RX   "MHZ Rx"
 #define D_SENSOR_MHZ_TX   "MHZ Tx"
@@ -450,9 +451,12 @@
 #define D_SENSOR_SDS0X1   "SDS0X1"
 #define D_SENSOR_SBR_RX   "SerBr Rx"
 #define D_SENSOR_SBR_TX   "SerBr Tx"
+#define D_SENSOR_SR04_TRIG "SR04 Tri"
+#define D_SENSOR_SR04_ECHO "SR04 Ech"
 
 // Units
 #define D_UNIT_AMPERE "A"
+#define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HOUR "hod"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h
index 2617e8e1b..b2ade5e2b 100644
--- a/sonoff/language/de-DE.h
+++ b/sonoff/language/de-DE.h
@@ -75,6 +75,7 @@
 #define D_DARKLIGHT "dunkel"
 #define D_DEBUG "debug"
 #define D_DISABLED "deaktiviert"
+#define D_DISTANCE "Abstand"
 #define D_DNS_SERVER "DNS-Server"
 #define D_DONE "erledigt"
 #define D_DST_TIME "DST"
@@ -450,9 +451,12 @@
 #define D_SENSOR_SDS0X1   "SDS0X1"
 #define D_SENSOR_SBR_RX   "SerBr Rx"
 #define D_SENSOR_SBR_TX   "SerBr Tx"
+#define D_SENSOR_SR04_TRIG "SR04 Tri"
+#define D_SENSOR_SR04_ECHO "SR04 Ech"
 
 // Units
 #define D_UNIT_AMPERE "A"
+#define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
diff --git a/sonoff/language/el-GR.h b/sonoff/language/el-GR.h
index 12e5542ce..7eff7094a 100644
--- a/sonoff/language/el-GR.h
+++ b/sonoff/language/el-GR.h
@@ -75,6 +75,7 @@
 #define D_DARKLIGHT "Σκούρο"
 #define D_DEBUG "Debug"
 #define D_DISABLED "Απενεργοποιημένο"
+#define D_DISTANCE "Distance"
 #define D_DNS_SERVER "Διακομιστής DNS"
 #define D_DONE "Εγινε"
 #define D_DST_TIME "DST"
@@ -450,9 +451,12 @@
 #define D_SENSOR_SDS0X1   "SDS0X1"
 #define D_SENSOR_SBR_RX   "SerBr Rx"
 #define D_SENSOR_SBR_TX   "SerBr Tx"
+#define D_SENSOR_SR04_TRIG "SR04 Tri"
+#define D_SENSOR_SR04_ECHO "SR04 Ech"
 
 // Units
 #define D_UNIT_AMPERE "A"
+#define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h
index 7c7c9568f..a57d18fd9 100644
--- a/sonoff/language/en-GB.h
+++ b/sonoff/language/en-GB.h
@@ -75,6 +75,7 @@
 #define D_DARKLIGHT "Dark"
 #define D_DEBUG "Debug"
 #define D_DISABLED "Disabled"
+#define D_DISTANCE "Distance"
 #define D_DNS_SERVER "DNS Server"
 #define D_DONE "Done"
 #define D_DST_TIME "DST"
@@ -450,9 +451,12 @@
 #define D_SENSOR_SDS0X1   "SDS0X1"
 #define D_SENSOR_SBR_RX   "SerBr Rx"
 #define D_SENSOR_SBR_TX   "SerBr Tx"
+#define D_SENSOR_SR04_TRIG "SR04 Tri"
+#define D_SENSOR_SR04_ECHO "SR04 Ech"
 
 // Units
 #define D_UNIT_AMPERE "A"
+#define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h
index 736e7849d..899a6057a 100644
--- a/sonoff/language/es-AR.h
+++ b/sonoff/language/es-AR.h
@@ -75,6 +75,7 @@
 #define D_DARKLIGHT "Oscura"
 #define D_DEBUG "Debug"
 #define D_DISABLED "Deshabilitado"
+#define D_DISTANCE "Distance"
 #define D_DNS_SERVER "DNS Server"
 #define D_DONE "Listo"
 #define D_DST_TIME "DST"
@@ -450,9 +451,12 @@
 #define D_SENSOR_SDS0X1   "SDS0X1"
 #define D_SENSOR_SBR_RX   "SerBr Rx"
 #define D_SENSOR_SBR_TX   "SerBr Tx"
+#define D_SENSOR_SR04_TRIG "SR04 Tri"
+#define D_SENSOR_SR04_ECHO "SR04 Ech"
 
 // Units
 #define D_UNIT_AMPERE "A"
+#define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h
index 4cd410a9e..a9211dab1 100644
--- a/sonoff/language/fr-FR.h
+++ b/sonoff/language/fr-FR.h
@@ -75,6 +75,7 @@
 #define D_DARKLIGHT "Sombre"
 #define D_DEBUG "Debug"
 #define D_DISABLED "Désactivé"
+#define D_DISTANCE "Distance"
 #define D_DNS_SERVER "Serveur DNS"
 #define D_DONE "Fait"
 #define D_DST_TIME "DST"
@@ -149,7 +150,7 @@
 #define D_TRUE "Vrai"
 #define D_TVOC "TVOC"
 #define D_UPGRADE "la mise à jour" 	 // "Lancer la mise à jour"
-#define D_UPLOAD "Upload"    // Not better in french 
+#define D_UPLOAD "Upload"    // Not better in french
 #define D_UPTIME "Durée d'activité"
 #define D_USER "Utilisateur"
 #define D_UTC_TIME "UTC"
@@ -309,14 +310,14 @@
 #define D_UPLOAD_ERR_3 "L'octet magique n'est pas 0xE9"
 #define D_UPLOAD_ERR_4 "La taille du programme à flasher est plus grande que la taille réelle de la mémoire flash"
 #define D_UPLOAD_ERR_5 "Erreur de comparaison du buffer de téléchargement"
-#define D_UPLOAD_ERR_6 "Téléchargement échoué. Activation logging 3"
+#define D_UPLOAD_ERR_6 "Téléchargement échoué. Activer Weblog 3"
 #define D_UPLOAD_ERR_7 "Téléchargement annulé"
 #define D_UPLOAD_ERR_8 "Fichier invalide"
 #define D_UPLOAD_ERR_9 "Fichier trop grand"
 #define D_UPLOAD_ERROR_CODE "Code d'erreur téléchargement"
 
 #define D_ENTER_COMMAND "Saisir une commande"
-#define D_ENABLE_WEBLOG_FOR_RESPONSE "Activer weblog 2 si response attendue"
+#define D_ENABLE_WEBLOG_FOR_RESPONSE "Activer Weblog 2 si une réponse est attendue"
 #define D_NEED_USER_AND_PASSWORD "Nécessite utilisateur=<username>&password=<password>"
 
 // xdrv_00_mqtt.ino
@@ -345,7 +346,7 @@
 #define D_HUE_API_NOT_IMPLEMENTED "API Hue non implémentée"
 #define D_HUE_API "Hue API"
 #define D_HUE_POST_ARGS "Hue POST args"
-#define D_3_RESPONSE_PACKETS_SENT "3 paquets Response envoyés"
+#define D_3_RESPONSE_PACKETS_SENT "3 paquets de réponse envoyés"
 
 // xdrv_05_domoticz.ino
 #define D_DOMOTICZ_PARAMETERS "Paramètres Domoticz"
@@ -381,7 +382,7 @@
 #define D_KNX_PHYSICAL_ADDRESS "Adresse individuelle"				// Backbone/Line/Device -> Zone/Ligne/Participant
 #define D_KNX_PHYSICAL_ADDRESS_NOTE "(Doit être unique sur le réseau KNX)"
 #define D_KNX_ENABLE "Activer KNX"
-#define D_KNX_GROUP_ADDRESS_TO_WRITE "Données à envoyer à  les Adresses de Groupe"
+#define D_KNX_GROUP_ADDRESS_TO_WRITE "Données à envoyer aux Adresses de Groupe"
 #define D_ADD "Ajoûter"
 #define D_DELETE "Supprimer"
 #define D_REPLY "Répondre"
@@ -450,9 +451,12 @@
 #define D_SENSOR_SDS0X1   "SDS0X1"
 #define D_SENSOR_SBR_RX   "SerBr Rx"
 #define D_SENSOR_SBR_TX   "SerBr Tx"
+#define D_SENSOR_SR04_TRIG "SR04 Tri"
+#define D_SENSOR_SR04_ECHO "SR04 Ech"
 
 // Units
 #define D_UNIT_AMPERE "A"
+#define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_KILOOHM "kΩ"
 #define D_UNIT_KILOWATTHOUR "kWh"
diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h
index 80c568688..51d9e146f 100644
--- a/sonoff/language/hu-HU.h
+++ b/sonoff/language/hu-HU.h
@@ -75,6 +75,7 @@
 #define D_DARKLIGHT "Min. fényerő"
 #define D_DEBUG "Debug"
 #define D_DISABLED "Letiltva"
+#define D_DISTANCE "Distance"
 #define D_DNS_SERVER "DNS Szerver"
 #define D_DONE "Kész"
 #define D_DST_TIME "DST"
@@ -450,9 +451,12 @@
 #define D_SENSOR_SDS0X1   "SDS0X1"
 #define D_SENSOR_SBR_RX   "SerBr Rx"
 #define D_SENSOR_SBR_TX   "SerBr Tx"
+#define D_SENSOR_SR04_TRIG "SR04 Tri"
+#define D_SENSOR_SR04_ECHO "SR04 Ech"
 
 // Units
 #define D_UNIT_AMPERE "A"
+#define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HOUR "ó"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h
index b273222e6..7bd6b65b5 100644
--- a/sonoff/language/it-IT.h
+++ b/sonoff/language/it-IT.h
@@ -75,6 +75,7 @@
 #define D_DARKLIGHT "Scuro"
 #define D_DEBUG "Debug"
 #define D_DISABLED "Disabilitato"
+#define D_DISTANCE "Distance"
 #define D_DNS_SERVER "DNS Server"
 #define D_DONE "Fatto"
 #define D_DST_TIME "DST"
@@ -450,9 +451,12 @@
 #define D_SENSOR_SDS0X1   "SDS0X1"
 #define D_SENSOR_SBR_RX   "SerBr Rx"
 #define D_SENSOR_SBR_TX   "SerBr Tx"
+#define D_SENSOR_SR04_TRIG "SR04 Tri"
+#define D_SENSOR_SR04_ECHO "SR04 Ech"
 
 // Units
 #define D_UNIT_AMPERE "A"
+#define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h
index 776bca8e9..5d3bcb959 100644
--- a/sonoff/language/nl-NL.h
+++ b/sonoff/language/nl-NL.h
@@ -75,6 +75,7 @@
 #define D_DARKLIGHT "Donker"
 #define D_DEBUG "Debug"
 #define D_DISABLED "Uitgeschakeld"
+#define D_DISTANCE "Afstand"
 #define D_DNS_SERVER "DNS Server"
 #define D_DONE "Klaar"
 #define D_DST_TIME "ZT"
@@ -450,9 +451,12 @@
 #define D_SENSOR_SDS0X1   "SDS0X1"
 #define D_SENSOR_SBR_RX   "SerBr Rx"
 #define D_SENSOR_SBR_TX   "SerBr Tx"
+#define D_SENSOR_SR04_TRIG "SR04 Tri"
+#define D_SENSOR_SR04_ECHO "SR04 Ech"
 
 // Units
 #define D_UNIT_AMPERE "A"
+#define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HOUR "h"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h
index 09715f1e0..19a27ebeb 100644
--- a/sonoff/language/pl-PL.h
+++ b/sonoff/language/pl-PL.h
@@ -75,6 +75,7 @@
 #define D_DARKLIGHT "Ciemny"
 #define D_DEBUG "Debug"
 #define D_DISABLED "Zablokowany"
+#define D_DISTANCE "Distance"
 #define D_DNS_SERVER "Server DNS"
 #define D_DONE "Wykonane"
 #define D_DST_TIME "DST"
@@ -450,9 +451,12 @@
 #define D_SENSOR_SDS0X1   "SDS0X1"
 #define D_SENSOR_SBR_RX   "SerBr Rx"
 #define D_SENSOR_SBR_TX   "SerBr Tx"
+#define D_SENSOR_SR04_TRIG "SR04 Tri"
+#define D_SENSOR_SR04_ECHO "SR04 Ech"
 
 // Units
 #define D_UNIT_AMPERE "A"
+#define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HOUR "Godz"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h
index 01293ed18..55ccf37a6 100644
--- a/sonoff/language/pt-PT.h
+++ b/sonoff/language/pt-PT.h
@@ -75,6 +75,7 @@
 #define D_DARKLIGHT "Luz Escura"
 #define D_DEBUG "Depurar"
 #define D_DISABLED "Disabilitado"
+#define D_DISTANCE "Distance"
 #define D_DNS_SERVER "Servidor DNS"
 #define D_DONE "Concluído"
 #define D_DST_TIME "DST"
@@ -450,9 +451,12 @@
 #define D_SENSOR_SDS0X1   "SDS0X1"
 #define D_SENSOR_SBR_RX   "SerBr Rx"
 #define D_SENSOR_SBR_TX   "SerBr Tx"
+#define D_SENSOR_SR04_TRIG "SR04 Tri"
+#define D_SENSOR_SR04_ECHO "SR04 Ech"
 
 // Units
 #define D_UNIT_AMPERE "A"
+#define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HOUR "Hr"
 #define D_UNIT_KILOOHM "kOhm"
 #define D_UNIT_KILOWATTHOUR "kWh"
diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h
index c5ecf5e69..96ad631ab 100644
--- a/sonoff/language/ru-RU.h
+++ b/sonoff/language/ru-RU.h
@@ -75,6 +75,7 @@
 #define D_DARKLIGHT "Темный"
 #define D_DEBUG "Отладка"
 #define D_DISABLED "Блокирован"
+#define D_DISTANCE "Distance"
 #define D_DNS_SERVER "DNS Сервер"
 #define D_DONE "Выполнено"
 #define D_DST_TIME "DST"
@@ -450,9 +451,12 @@
 #define D_SENSOR_SDS0X1   "SDS0X1"
 #define D_SENSOR_SBR_RX   "SerBr Rx"
 #define D_SENSOR_SBR_TX   "SerBr Tx"
+#define D_SENSOR_SR04_TRIG "SR04 Tri"
+#define D_SENSOR_SR04_ECHO "SR04 Ech"
 
 // Units
 #define D_UNIT_AMPERE "А"
+#define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HOUR "Ч"
 #define D_UNIT_KILOOHM "кОм"
 #define D_UNIT_KILOWATTHOUR "кВт"
diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h
index ad52fef54..b90ab7b1d 100644
--- a/sonoff/language/zh-CN.h
+++ b/sonoff/language/zh-CN.h
@@ -75,6 +75,7 @@
 #define D_DARKLIGHT "Dark"
 #define D_DEBUG "调试"
 #define D_DISABLED "禁用"
+#define D_DISTANCE "Distance"
 #define D_DNS_SERVER "DNS服务器"
 #define D_DONE "完成"
 #define D_DST_TIME "DST"
@@ -450,9 +451,12 @@
 #define D_SENSOR_SDS0X1   "SDS0X1"
 #define D_SENSOR_SBR_RX   "SerBr Rx"
 #define D_SENSOR_SBR_TX   "SerBr Tx"
+#define D_SENSOR_SR04_TRIG "SR04 Tri"
+#define D_SENSOR_SR04_ECHO "SR04 Ech"
 
 // Units
 #define D_UNIT_AMPERE "安"
+#define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HOUR "时"
 #define D_UNIT_KILOOHM "千欧"
 #define D_UNIT_KILOWATTHOUR "千瓦时"
diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h
index 927032310..b13f0ba04 100644
--- a/sonoff/language/zh-TW.h
+++ b/sonoff/language/zh-TW.h
@@ -75,6 +75,7 @@
 #define D_DARKLIGHT "Dark"
 #define D_DEBUG "除錯"
 #define D_DISABLED "停用"
+#define D_DISTANCE "Distance"
 #define D_DNS_SERVER "DNS伺服器"
 #define D_DONE "完成"
 #define D_DST_TIME "DST"
@@ -450,9 +451,12 @@
 #define D_SENSOR_SDS0X1   "SDS0X1"
 #define D_SENSOR_SBR_RX   "SerBr Rx"
 #define D_SENSOR_SBR_TX   "SerBr Tx"
+#define D_SENSOR_SR04_TRIG "SR04 Tri"
+#define D_SENSOR_SR04_ECHO "SR04 Ech"
 
 // Units
 #define D_UNIT_AMPERE "安"
+#define D_UNIT_CENTIMETER "cm"
 #define D_UNIT_HOUR "時"
 #define D_UNIT_KILOOHM "千歐"
 #define D_UNIT_KILOWATTHOUR "千瓦時"
diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino
index df9997cfd..00850b891 100644
--- a/sonoff/sonoff.ino
+++ b/sonoff/sonoff.ino
@@ -2041,9 +2041,9 @@ void SerialInput()
     }
 
 /*-------------------------------------------------------------------------------------------*\
- * Sonoff S31 4800 baud serial interface
+ * Sonoff S31 and Sonoff Pow R2 4800 baud serial interface
 \*-------------------------------------------------------------------------------------------*/
-    if (SONOFF_S31 == Settings.module) {
+    if ((SONOFF_S31 == Settings.module) || (SONOFF_POW_R2 == Settings.module)) {
       if (CseSerialInput()) {
         serial_in_byte_counter = 0;
         Serial.flush();
diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h
index b7ceb6c24..b3f95152f 100644
--- a/sonoff/sonoff_template.h
+++ b/sonoff/sonoff_template.h
@@ -91,6 +91,8 @@ enum UserSelectablePins {
   GPIO_SDS0X1,         // Nova Fitness SDS011 Serial interface
   GPIO_SBR_TX,         // Serial Bridge Serial interface
   GPIO_SBR_RX,         // Serial Bridge Serial interface
+  GPIO_SR04_TRIG,      // SR04 Trigger pin
+  GPIO_SR04_ECHO,      // SR04 Echo pin
   GPIO_SENSOR_END };
 
 // Programmer selectable GPIO functionality offset by user selectable GPIOs
@@ -133,7 +135,8 @@ const char kSensorNames[] PROGMEM =
   D_SENSOR_SAIR_TX "|" D_SENSOR_SAIR_RX "|"
   D_SENSOR_SPI_CS "|" D_SENSOR_SPI_DC "|" D_SENSOR_BACKLIGHT "|"
   D_SENSOR_PMS5003 "|" D_SENSOR_SDS0X1 "|"
-  D_SENSOR_SBR_TX "|" D_SENSOR_SBR_RX;
+  D_SENSOR_SBR_TX "|" D_SENSOR_SBR_RX "|"
+  D_SENSOR_SR04_TRIG "|" D_SENSOR_SR04_ECHO;
 
 /********************************************************************************************/
 
@@ -181,6 +184,7 @@ enum SupportedModules {
   ARILUX_LC06,
   SONOFF_S31,
   ZENGGE_ZF_WF017,
+  SONOFF_POW_R2,
   MAXMODULE };
 
 /********************************************************************************************/
@@ -205,6 +209,7 @@ const uint8_t kNiceList[MAXMODULE] PROGMEM = {
   SONOFF_DUAL,
   SONOFF_DUAL_R2,
   SONOFF_POW,
+  SONOFF_POW_R2,
   SONOFF_S31,
   SONOFF_4CH,
   SONOFF_4CHPRO,
@@ -318,7 +323,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
      GPIO_USER,        // GPIO14 Optional sensor
      0, 0, 0
   },
-  { "Sonoff Pow",      // Sonoff Pow (ESP8266)
+  { "Sonoff Pow",      // Sonoff Pow (ESP8266 - HLW8012)
      GPIO_KEY1,        // GPIO00 Button
      0, 0, 0, 0,
      GPIO_HLW_SEL,     // GPIO05 HLW8012 Sel output
@@ -326,7 +331,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
      GPIO_REL1,        // GPIO12 Red Led and Relay (0 = Off, 1 = On)
      GPIO_HLW_CF1,     // GPIO13 HLW8012 CF1 voltage / current
      GPIO_HLW_CF,      // GPIO14 HLW8012 CF power
-     GPIO_LED1,        // GPIO15 Green Led (0 = On, 1 = Off)
+     GPIO_LED1,        // GPIO15 Blue Led (0 = On, 1 = Off)
      0, 0
   },
   { "Sonoff 4CH",      // Sonoff 4CH (ESP8285)
@@ -781,7 +786,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
      GPIO_USER,        // GPIO15 RGBW LED White
      0, 0
   },
-  { "Sonoff S31",      // Sonoff S31 (ESP8266)
+  { "Sonoff S31",      // Sonoff S31 (ESP8266 - CSE7766)
      GPIO_KEY1,        // GPIO00 Button
      0,                // GPIO01 Serial RXD 4800 baud 8E1 CSE7766 energy sensor
      0,
@@ -804,6 +809,17 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
      GPIO_PWM1,        // GPIO13 RGB LED Red
      GPIO_PWM3,        // GPIO14 RGB LED Blue
      0, 0, 0
+  },
+  { "Sonoff Pow R2",   // Sonoff Pow R2 (ESP8285 - CSE7766)
+     GPIO_KEY1,        // GPIO00 Button
+     0,                // GPIO01 Serial RXD 4800 baud 8E1 CSE7766 energy sensor
+     0,
+     0,                // GPIO03 Serial TXD
+     0, 0,
+     0, 0, 0, 0, 0, 0, // Flash connection
+     GPIO_REL1,        // GPIO12 Red Led and Relay (0 = Off, 1 = On)
+     GPIO_LED1_INV,    // GPIO13 Blue Led (0 = On, 1 = Off)
+     0, 0, 0, 0
   }
 };
 
diff --git a/sonoff/support.ino b/sonoff/support.ino
index 401b74e17..34d271644 100644
--- a/sonoff/support.ino
+++ b/sonoff/support.ino
@@ -232,7 +232,7 @@ char* UpperCase_P(char* dest, const char* source)
   return dest;
 }
 
-char* SpaceToUnderscore(char* dest, const char* source)
+char* NoAlNumToUnderscore(char* dest, const char* source)
 {
   char* write = dest;
   const char* read = source;
@@ -240,7 +240,7 @@ char* SpaceToUnderscore(char* dest, const char* source)
 
   while (ch != '\0') {
     ch = *read++;
-    *write++ = (ch == ' ') ? '_' : ch;
+    *write++ = (isalnum(ch) || ('\0' == ch)) ? ch : '_';
   }
   return dest;
 }
diff --git a/sonoff/user_config.h b/sonoff/user_config.h
index 71532a03f..da300b06b 100644
--- a/sonoff/user_config.h
+++ b/sonoff/user_config.h
@@ -165,6 +165,7 @@
 
 // -- Localization --------------------------------
   // If non selected the default en-GB will be used
+//#define MY_LANGUAGE            bg-BG           // Bulgarian in Bulgaria
 //#define MY_LANGUAGE            cs-CZ           // Czech in Czech
 //#define MY_LANGUAGE            de-DE           // German in Germany
 //#define MY_LANGUAGE            el-GR           // Greek in Greece
@@ -285,6 +286,8 @@
 
 #define USE_ARILUX_RF                            // Add support for Arilux RF remote controller (+0k8 code, 252 iram (non 2.3.0))
 
+#define USE_SR04                                 // Add support for HC-SR04 ultrasonic devices (+1k code)
+
 /*********************************************************************************************\
  * Select all sensors - overrides above undefines!!
 \*********************************************************************************************/
diff --git a/sonoff/webserver.ino b/sonoff/webserver.ino
index 29067e14b..1dc3eda52 100644
--- a/sonoff/webserver.ino
+++ b/sonoff/webserver.ino
@@ -396,9 +396,7 @@ void StartWebserver(int type, IPAddress ipweb)
       my_hostname, (mdns_begun) ? ".local" : "", ipweb.toString().c_str());
     AddLog(LOG_LEVEL_INFO);
   }
-  if (type) {
-    webserver_state = type;
-  }
+  if (type) { webserver_state = type; }
 }
 
 void StopWebserver()
@@ -435,12 +433,8 @@ void WifiManagerBegin()
 
 void PollDnsWebserver()
 {
-  if (DnsServer) {
-    DnsServer->processNextRequest();
-  }
-  if (WebServer) {
-    WebServer->handleClient();
-  }
+  if (DnsServer) { DnsServer->processNextRequest(); }
+  if (WebServer) { WebServer->handleClient(); }
 }
 
 /*********************************************************************************************/
@@ -495,9 +489,7 @@ void HandleRoot()
 {
   AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_MAIN_MENU);
 
-  if (CaptivePortal()) { // If captive portal redirect instead of displaying the page.
-    return;
-  }
+  if (CaptivePortal()) { return; }  // If captive portal redirect instead of displaying the page.
 
   if (HTTP_MANAGER == webserver_state) {
     if ((Settings.web_password[0] != 0) && !(WebServer->hasArg("USER1")) && !(WebServer->hasArg("PASS1"))) {
@@ -549,9 +541,7 @@ void HandleRoot()
       page += F("<tr>");
       byte idx = 0;
       for (byte i = 0; i < 4; i++) {
-        if (idx > 0) {
-          page += F("</tr><tr>");
-        }
+        if (idx > 0) { page += F("</tr><tr>"); }
         for (byte j = 0; j < 4; j++) {
           idx++;
           snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("<td style='width:25%'><button onclick='la(\"?k=%d\");'>%d</button></td>"), idx, idx);
@@ -620,17 +610,13 @@ void HandleAjaxStatusRefresh()
 boolean HttpUser()
 {
   boolean status = (HTTP_USER == webserver_state);
-  if (status) {
-    HandleRoot();
-  }
+  if (status) { HandleRoot(); }
   return status;
 }
 
 void HandleConfiguration()
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
   AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURATION);
 
   String page = FPSTR(HTTP_HEAD);
@@ -638,10 +624,10 @@ void HandleConfiguration()
   page += FPSTR(HTTP_HEAD_STYLE);
   page += FPSTR(HTTP_BTN_MENU_MODULE);
 #if defined(USE_TIMERS) && defined(USE_TIMERS_WEB)
-  if (devices_present) page += FPSTR(HTTP_BTN_MENU_TIMER);
+  if (devices_present) { page += FPSTR(HTTP_BTN_MENU_TIMER); }
 #endif  // USE_TIMERS and USE_TIMERS_WEB
   page += FPSTR(HTTP_BTN_MENU_WIFI);
-  if (Settings.flag.mqtt_enabled) page += FPSTR(HTTP_BTN_MENU_MQTT);
+  if (Settings.flag.mqtt_enabled) { page += FPSTR(HTTP_BTN_MENU_MQTT); }
   page += FPSTR(HTTP_BTN_MENU4);
   page += FPSTR(HTTP_BTN_MAIN);
   ShowPage(page);
@@ -651,26 +637,20 @@ boolean GetUsedInModule(byte val, uint8_t *arr)
 {
   int offset = 0;
 
-  if (!val) {
-    return false;  // None
-  }
+  if (!val) { return false; }  // None
 #ifndef USE_I2C
-  if (GPIO_I2C_SCL == val) {
-    return true;
-  }
-  if (GPIO_I2C_SDA == val) {
-    return true;
-  }
+  if (GPIO_I2C_SCL == val) { return true; }
+  if (GPIO_I2C_SDA == val) { return true; }
+#endif
+#ifndef USE_SR04
+  if (GPIO_SR04_TRIG == val) { return true; }
+  if (GPIO_SR04_ECHO == val) { return true; }
 #endif
 #ifndef USE_WS2812
-  if (GPIO_WS2812 == val) {
-    return true;
-  }
+  if (GPIO_WS2812 == val) { return true; }
 #endif
 #ifndef USE_IR_REMOTE
-  if (GPIO_IRSEND == val) {
-    return true;
-  }
+  if (GPIO_IRSEND == val) { return true; }
 #endif
   if ((val >= GPIO_REL1) && (val < GPIO_REL1 + MAX_RELAYS)) {
     offset = (GPIO_REL1_INV - GPIO_REL1);
@@ -693,21 +673,15 @@ boolean GetUsedInModule(byte val, uint8_t *arr)
     offset = -(GPIO_PWM1_INV - GPIO_PWM1);
   }
   for (byte i = 0; i < MAX_GPIO_PIN; i++) {
-    if (arr[i] == val) {
-      return true;
-    }
-    if (arr[i] == val + offset) {
-      return true;
-    }
+    if (arr[i] == val) { return true; }
+    if (arr[i] == val + offset) { return true; }
   }
   return false;
 }
 
 void HandleModuleConfiguration()
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
   char stemp[20];
   uint8_t midx;
 
@@ -777,9 +751,7 @@ void HandleWifiConfiguration()
 
 void HandleWifi(boolean scan)
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
 
   AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_WIFI);
 
@@ -818,15 +790,13 @@ void HandleWifi(boolean scan)
       if (remove_duplicate_access_points) {
         String cssid;
         for (int i = 0; i < n; i++) {
-          if (-1 == indices[i]) {
-            continue;
-          }
+          if (-1 == indices[i]) { continue; }
           cssid = WiFi.SSID(indices[i]);
           for (int j = i + 1; j < n; j++) {
             if (cssid == WiFi.SSID(indices[j])) {
               snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_WIFI D_DUPLICATE_ACCESSPOINT " %s"), WiFi.SSID(indices[j]).c_str());
               AddLog(LOG_LEVEL_DEBUG);
-              indices[j] = -1; // set dup aps to index -1
+              indices[j] = -1;  // set dup aps to index -1
             }
           }
         }
@@ -834,9 +804,7 @@ void HandleWifi(boolean scan)
 
       //display networks in page
       for (int i = 0; i < n; i++) {
-        if (-1 == indices[i]) {
-          continue; // skip dups
-        }
+        if (-1 == indices[i]) { continue; }  // skip dups
         snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_WIFI D_SSID " %s, " D_RSSI " %d"), WiFi.SSID(indices[i]).c_str(), WiFi.RSSI(indices[i]));
         AddLog(LOG_LEVEL_DEBUG);
         int quality = WifiGetRssiAsQuality(WiFi.RSSI(indices[i]));
@@ -878,9 +846,7 @@ void HandleWifi(boolean scan)
 
 void HandleMqttConfiguration()
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
   AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_MQTT);
 
   String page = FPSTR(HTTP_HEAD);
@@ -903,9 +869,7 @@ void HandleMqttConfiguration()
 
 void HandleLoggingConfiguration()
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
   AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_LOGGING);
 
   String page = FPSTR(HTTP_HEAD);
@@ -952,9 +916,7 @@ void HandleLoggingConfiguration()
 
 void HandleOtherConfiguration()
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
   AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONFIGURE_OTHER);
   char stemp[40];
 
@@ -990,9 +952,7 @@ void HandleOtherConfiguration()
 
 void HandleBackupConfiguration()
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
   AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_BACKUP_CONFIGURATION));
 
   uint8_t buffer[sizeof(Settings)];
@@ -1002,7 +962,7 @@ void HandleBackupConfiguration()
 
   char attachment[100];
   char friendlyname[sizeof(Settings.friendlyname[0])];
-  snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), SpaceToUnderscore(friendlyname, Settings.friendlyname[0]), my_version);
+  snprintf_P(attachment, sizeof(attachment), PSTR("attachment; filename=Config_%s_%s.dmp"), NoAlNumToUnderscore(friendlyname, Settings.friendlyname[0]), my_version);
   WebServer->sendHeader(F("Content-Disposition"), attachment);
   WebServer->send(200, FPSTR(HDR_CTYPE_STREAM), "");
   memcpy(buffer, &Settings, sizeof(buffer));
@@ -1018,9 +978,7 @@ void HandleBackupConfiguration()
 
 void HandleSaveSettings()
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
 
   char stemp[TOPSZ];
   char stemp2[TOPSZ];
@@ -1186,9 +1144,7 @@ void HandleSaveSettings()
 
 void HandleResetConfiguration()
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
 
   char svalue[33];
 
@@ -1208,9 +1164,7 @@ void HandleResetConfiguration()
 
 void HandleRestoreConfiguration()
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
   AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESTORE_CONFIGURATION);
 
   String page = FPSTR(HTTP_HEAD);
@@ -1228,9 +1182,7 @@ void HandleRestoreConfiguration()
 
 void HandleUpgradeFirmware()
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
   AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_FIRMWARE_UPGRADE);
 
   String page = FPSTR(HTTP_HEAD);
@@ -1249,9 +1201,7 @@ void HandleUpgradeFirmware()
 
 void HandleUpgradeFirmwareStart()
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
   char svalue[100];
 
   AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_UPGRADE_STARTED));
@@ -1278,9 +1228,7 @@ void HandleUpgradeFirmwareStart()
 
 void HandleUploadDone()
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
   AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_UPLOAD_DONE));
 
   char error[100];
@@ -1327,13 +1275,9 @@ void HandleUploadLoop()
   // Based on ESP8266HTTPUpdateServer.cpp uses ESP8266WebServer Parsing.cpp and Cores Updater.cpp (Update)
   boolean _serialoutput = (LOG_LEVEL_DEBUG <= seriallog_level);
 
-  if (HTTP_USER == webserver_state) {
-    return;
-  }
+  if (HTTP_USER == webserver_state) { return; }
   if (upload_error) {
-    if (!upload_file_type) {
-      Update.end();
-    }
+    if (!upload_file_type) { Update.end(); }
     return;
   }
 
@@ -1408,9 +1352,7 @@ void HandleUploadLoop()
       if (_serialoutput) {
         Serial.printf(".");
         upload_progress_dot_count++;
-        if (!(upload_progress_dot_count % 80)) {
-          Serial.println();
-        }
+        if (!(upload_progress_dot_count % 80)) { Serial.println(); }
       }
     }
   } else if(!upload_error && (UPLOAD_FILE_END == upload.status)) {
@@ -1419,9 +1361,7 @@ void HandleUploadLoop()
     }
     if (!upload_file_type) {
       if (!Update.end(true)) { // true to set the size to the current progress
-        if (_serialoutput) {
-          Update.printError(Serial);
-        }
+        if (_serialoutput) { Update.printError(Serial); }
         upload_error = 6;
         return;
       }
@@ -1434,9 +1374,7 @@ void HandleUploadLoop()
     restart_flag = 0;
     MqttRetryCounter(0);
     upload_error = 7;
-    if (!upload_file_type) {
-      Update.end();
-    }
+    if (!upload_file_type) { Update.end(); }
   }
   delay(0);
 }
@@ -1451,9 +1389,7 @@ void HandlePreflightRequest()
 
 void HandleHttpCommand()
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
   char svalue[INPUT_BUFFER_SIZE];  // big to serve Backlog
 
   AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP D_COMMAND));
@@ -1473,12 +1409,7 @@ void HandleHttpCommand()
   if (valid) {
     byte curridx = web_log_index;
     WebGetArg("cmnd", svalue, sizeof(svalue));
-    if (strlen(svalue)) {
-//      byte syslog_now = syslog_level;
-//      syslog_level = 0;  // Disable UDP syslog to not trigger hardware WDT - Seems to work fine since 5.7.1d (global logging)
-      ExecuteCommand(svalue);
-//      syslog_level = syslog_now;
-    }
+    if (strlen(svalue)) { ExecuteCommand(svalue); }
 
     if (web_log_index != curridx) {
       byte counter = curridx;
@@ -1491,9 +1422,7 @@ void HandleHttpCommand()
           // [14:49:36 MQTT: stat/wemos5/RESULT = {"POWER":"OFF"}] > [{"POWER":"OFF"}]
           char* JSON = (char*)memchr(tmp, '{', len);
           if (JSON) { // Is it a JSON message (and not only [15:26:08 MQT: stat/wemos5/POWER = O])
-            if (message.length() > 1) {
-              message += F(",");
-            }
+            if (message.length() > 1) { message += F(","); }
             size_t JSONlen = len - (JSON - tmp);
             strlcpy(mqtt_data, JSON +1, JSONlen -2);
             message += mqtt_data;
@@ -1515,10 +1444,7 @@ void HandleHttpCommand()
 
 void HandleConsole()
 {
-  if (HttpUser()) {
-    return;
-  }
-
+  if (HttpUser()) { return; }
   AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_CONSOLE);
 
   String page = FPSTR(HTTP_HEAD);
@@ -1533,9 +1459,7 @@ void HandleConsole()
 
 void HandleAjaxConsoleRefresh()
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
   char svalue[INPUT_BUFFER_SIZE];  // big to serve Backlog
   byte cflg = 1;
   byte counter = 0;                // Initial start, should never be 0 again
@@ -1544,16 +1468,11 @@ void HandleAjaxConsoleRefresh()
   if (strlen(svalue)) {
     snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_COMMAND "%s"), svalue);
     AddLog(LOG_LEVEL_INFO);
-//    byte syslog_now = syslog_level;
-//    syslog_level = 0;  // Disable UDP syslog to not trigger hardware WDT - Seems to work fine since 5.7.1d (global logging)
     ExecuteCommand(svalue);
-//    syslog_level = syslog_now;
   }
 
   WebGetArg("c2", svalue, sizeof(svalue));
-  if (strlen(svalue)) {
-    counter = atoi(svalue);
-  }
+  if (strlen(svalue)) { counter = atoi(svalue); }
 
   byte last_reset_web_log_flag = reset_web_log_flag;
   String message = F("}9");  // Cannot load mqtt_data here as <> will be encoded by replacements below
@@ -1580,7 +1499,7 @@ void HandleAjaxConsoleRefresh()
         message += mqtt_data;
       }
       counter++;
-      if (!counter) counter++;  // Skip 0 as it is not allowed
+      if (!counter) { counter++; } // Skip 0 as it is not allowed
     } while (counter != web_log_index);
     // XML encoding to fix blank console log in concert with javascript decodeURIComponent
     message.replace(F("%"), F("%25"));  // Needs to be done first as otherwise the % in %26 will also be converted
@@ -1596,9 +1515,7 @@ void HandleAjaxConsoleRefresh()
 
 void HandleInformation()
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
   AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_INFORMATION);
 
   char stopic[TOPSZ];
@@ -1712,9 +1629,7 @@ void HandleInformation()
 
 void HandleRestart()
 {
-  if (HttpUser()) {
-    return;
-  }
+  if (HttpUser()) { return; }
   AddLog_P(LOG_LEVEL_DEBUG, S_LOG_HTTP, S_RESTART);
 
   String page = FPSTR(HTTP_HEAD);
@@ -1738,9 +1653,7 @@ void HandleNotFound()
 //  snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_HTTP "Not fount (%s)"), WebServer->uri().c_str());
 //  AddLog(LOG_LEVEL_DEBUG);
 
-  if (CaptivePortal()) { // If captive portal redirect instead of displaying the error page.
-    return;
-  }
+  if (CaptivePortal()) { return; }  // If captive portal redirect instead of displaying the error page.
 
 #ifdef USE_EMULATION
   String path = WebServer->uri();
@@ -1778,9 +1691,7 @@ boolean ValidIpAddress(String str)
 {
   for (uint16_t i = 0; i < str.length(); i++) {
     int c = str.charAt(i);
-    if (c != '.' && (c < '0' || c > '9')) {
-      return false;
-    }
+    if (c != '.' && (c < '0' || c > '9')) { return false; }
   }
   return true;
 }
diff --git a/sonoff/xdrv_03_energy.ino b/sonoff/xdrv_03_energy.ino
index a1052a077..fc70751bf 100644
--- a/sonoff/xdrv_03_energy.ino
+++ b/sonoff/xdrv_03_energy.ino
@@ -252,7 +252,7 @@ void HlwInit()
 }
 
 /*********************************************************************************************\
- * CSE7766 - Energy (Sonoff S31)
+ * CSE7766 - Energy (Sonoff S31 and Sonoff Pow R2)
  *
  * Based on datasheet from http://www.chipsea.com/UploadFiles/2017/08/11144342F01B5662.pdf
 \*********************************************************************************************/
@@ -1015,9 +1015,9 @@ boolean EnergyCommand()
 void EnergyDrvInit()
 {
   energy_flg = ENERGY_NONE;
-  if ((pin[GPIO_HLW_SEL] < 99) && (pin[GPIO_HLW_CF1] < 99) && (pin[GPIO_HLW_CF] < 99)) {  // Sonoff Pow
+  if ((pin[GPIO_HLW_SEL] < 99) && (pin[GPIO_HLW_CF1] < 99) && (pin[GPIO_HLW_CF] < 99)) {  // Sonoff Pow or any HLW8012 based device
     energy_flg = ENERGY_HLW8012;
-  } else if (SONOFF_S31 == Settings.module) {  // Sonoff S31
+  } else if ((SONOFF_S31 == Settings.module) || (SONOFF_POW_R2 == Settings.module)) {     // Sonoff S31 or Sonoff Pow R2
     baudrate = 4800;
     serial_config = SERIAL_8E1;
     energy_flg = ENERGY_CSE7766;
diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino
index 4b216b676..fa58b3e8b 100644
--- a/sonoff/xdrv_09_timers.ino
+++ b/sonoff/xdrv_09_timers.ino
@@ -491,17 +491,17 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM =
     "m=qs('input[name=\"rd\"]:checked').value;"                   // Get mode
     "p=pt[ct]&0x7FF;"                                             // Get time
     "if(m==0){"                                                   // Time is set
+      "so(0);"                                                    // Hide offset span and allow Hour 00..23
       "q=Math.floor(p/60);if(q<10){q='0'+q;}qs('#ho').value=q;"   // Set hours
       "q=p%60;if(q<10){q='0'+q;}qs('#mi').value=q;"               // Set minutes
-      "so(0);"                                                    // Schedule time, hide offset span
     "}"
     "if((m==1)||(m==2)){"                                         // Sunrise or sunset is set
+      "so(1);"                                                    // Show offset span and allow Hour 00..11
       "q=Math.floor(p/60);"                                       // Parse hours
       "if(q>=12){q-=12;qs('#dr').selectedIndex=1;}"               // Negative offset
         "else{qs('#dr').selectedIndex=0;}"
       "if(q<10){q='0'+q;}qs('#ho').value=q;"                      // Set offset hours
       "q=p%60;if(q<10){q='0'+q;}qs('#mi').value=q;"               // Set offset minutes
-      "so(1);"                                                    // Show offset span
     "}"
   "}"
   "function so(b){"                                               // Hide or show offset items
@@ -536,7 +536,7 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM =
       "s|=l&0x7FF;"                                               // Save offset instead of time
     "}"
 #endif
-    "s|=((qs('#mw').selectedIndex)&0x0F)<<11;"                      // Get window minutes
+    "s|=((qs('#mw').selectedIndex)&0x0F)<<11;"                    // Get window minutes
     "pt[ct]=s;"
     "eb('t0').value=pt.join();"                                   // Save parameters from array to hidden area
   "}"
@@ -568,7 +568,7 @@ const char HTTP_TIMER_SCRIPT[] PROGMEM =
     "pt=eb('t0').value.split(',').map(Number);"                   // Get parameters from hidden area to array
     "s='';for(i=0;i<" STR(MAX_TIMERS) ";i++){b='';if(0==i){b=\" id='dP'\";}s+=\"<button type='button' class='tl' onclick='ot(\"+i+\",this)'\"+b+\">\"+(i+1)+\"</button>\"}"
     "eb('bt').innerHTML=s;"                                       // Create tabs
-#ifdef USE_SUNRISE                                                // NEW: Create offset options (+/- up to 11h, 59m)
+#ifdef USE_SUNRISE
     "o=qs('#dr');ce('+',o);ce('-',o);"                            // Create offset direction select options
 #endif
     "o=qs('#ho');for(i=0;i<=23;i++){ce((i<10)?('0'+i):i,o);}"     // Create hours select options
diff --git a/sonoff/xsns_22_sr04.ino b/sonoff/xsns_22_sr04.ino
new file mode 100644
index 000000000..5a3a7dc87
--- /dev/null
+++ b/sonoff/xsns_22_sr04.ino
@@ -0,0 +1,173 @@
+/*
+  xsns_22_sr04.ino - SR04 ultrasonic sensor support for Sonoff-Tasmota
+
+  Copyright (C) 2018  Nuno Ferreira and Theo Arends
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifdef USE_SR04
+/*********************************************************************************************\
+ * HC-SR04, HC-SR04+, JSN-SR04T - Ultrasonic distance sensor
+ *
+ * Code for SR04 family of ultrasonic distance sensors
+ * References:
+ * - https://www.dfrobot.com/wiki/index.php/Weather-proof_Ultrasonic_Sensor_SKU_:_SEN0207
+\*********************************************************************************************/
+#define max(a,b) ((a)>(b)?(a):(b))
+
+uint8_t sr04_echo_pin = 0;
+uint8_t sr04_trig_pin = 0;
+
+/*********************************************************************************************\
+ * Embedded stripped and tuned NewPing library from Tim Eckel - teckel@leethost.com
+ * https://bitbucket.org/teckel12/arduino-new-ping
+\*********************************************************************************************/
+#define US_ROUNDTRIP_CM       58      // Microseconds (uS) it takes sound to travel round-trip 1cm (2cm total), uses integer to save compiled code space. Default: 58
+#define US_ROUNDTRIP_IN       148     // Microseconds (uS) it takes sound to travel round-trip 1 inch (2 inches total), uses integer to save compiled code space. Default: 148
+#define PING_MEDIAN_DELAY     29000
+#define MAX_SENSOR_DISTANCE   500
+#define PING_OVERHEAD         5
+
+// Conversion from uS to distance (round result to nearest cm or inch).
+#define EchoConvert(echoTime, conversionFactor) (max(((unsigned int)echoTime + conversionFactor / 2) / conversionFactor, (echoTime ? 1 : 0)))
+
+/********************************************************************************************/
+
+void Sr04Init()
+{
+  sr04_echo_pin = pin[GPIO_SR04_ECHO];
+  sr04_trig_pin = pin[GPIO_SR04_TRIG];
+  pinMode(sr04_trig_pin, OUTPUT);
+  pinMode(sr04_echo_pin, INPUT_PULLUP);
+}
+
+boolean Sr04Read(uint16_t *distance)
+{
+  uint16_t duration = 0;
+
+  *distance = 0;
+
+  /* Send ping and get delay */
+  duration = Sr04GetSamples(9, 250);
+
+  /* Calculate the distance (in cm) based on the speed of sound. */
+  *distance = EchoConvert(duration, US_ROUNDTRIP_CM);
+
+  return 1;
+}
+
+uint16_t Sr04Ping(uint16_t max_cm_distance)
+{
+  uint16_t duration = 0;
+  uint16_t maxEchoTime, maxTime;
+
+  maxEchoTime = min(max_cm_distance + 1, (uint16_t) MAX_SENSOR_DISTANCE + 1) * US_ROUNDTRIP_CM;
+
+  /* The following trigPin/echoPin cycle is used to determine the
+     distance of the nearest object by bouncing soundwaves off of it. */
+  digitalWrite(sr04_trig_pin, LOW);
+  delayMicroseconds(2);
+  digitalWrite(sr04_trig_pin, HIGH);
+  delayMicroseconds(10);
+  digitalWrite(sr04_trig_pin, LOW);
+
+  /* Wait for the echo */
+  duration = pulseIn(sr04_echo_pin, HIGH, 26000) - PING_OVERHEAD;
+
+  return (duration > maxEchoTime) ? 0 : duration;
+}
+
+uint16_t Sr04GetSamples(uint8_t it, uint16_t max_cm_distance) {
+  uint16_t uS[it];
+  uint16_t last;
+  uint8_t j;
+  uint8_t i = 0;
+  uint16_t t;
+  uS[0] = 0;
+
+  while (i < it) {
+    t = micros();
+    last = Sr04Ping(max_cm_distance);
+
+    if (last != 0) {
+      if (i > 0) {
+        for (j = i; j > 0 && uS[j - 1] < last; j--) {
+          uS[j] = uS[j - 1];
+        }
+      } else {
+        j = 0;
+      }
+      uS[j] = last;
+      i++;
+    } else {
+      it--;
+    }
+    if (i < it && micros() - t < PING_MEDIAN_DELAY) {
+      delay((PING_MEDIAN_DELAY + t - micros()) / 1000);
+    }
+  }
+
+  return (uS[1]); // Return the ping distance from the 2nd highest reading
+}
+
+#ifdef USE_WEBSERVER
+const char HTTP_SNS_DISTANCE[] PROGMEM =
+  "%s{s}SR04 " D_DISTANCE "{m}%d" D_UNIT_CENTIMETER "{e}";  // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
+#endif  // USE_WEBSERVER
+
+void Sr04Show(boolean json)
+{
+  uint16_t distance;
+
+  if (Sr04Read(&distance)) {                // Check if read failed
+    if(json) {
+      snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"SR04\":{\"" D_JSON_DISTANCE "\":%d}"), mqtt_data, distance);
+#ifdef USE_WEBSERVER
+    } else {
+      snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_DISTANCE, mqtt_data, distance);
+#endif  // USE_WEBSERVER
+    }
+  }
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+#define XSNS_22
+
+boolean Xsns22(byte function)
+{
+  boolean result = false;
+
+  if ((pin[GPIO_SR04_ECHO] < 99) && (pin[GPIO_SR04_TRIG] < 99)) {
+    switch (function) {
+      case FUNC_INIT:
+        Sr04Init();
+        break;
+      case FUNC_JSON_APPEND:
+        Sr04Show(1);
+        break;
+#ifdef USE_WEBSERVER
+      case FUNC_WEB_APPEND:
+        Sr04Show(0);
+        break;
+#endif  // USE_WEBSERVER
+    }
+  }
+  return result;
+}
+
+#endif  // USE_SR04