diff --git a/CHANGELOG.md b/CHANGELOG.md
index 602e733f..df3b9aac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,29 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.7.0] 2017-03-27
+### Added
+- Web interface embedded in firmware image by default
+- Upload firmware image from web interface
+- Added API entry point to change light color
+- Added generic analog sensor. Thanks to Francesco Boscarino
+- Report RSSI value in debug console and MQTT status messages
+- Added support for Magic Home LED Controller
+- Added support for ESPurna-H Board (based on HLW8012)
+- Added forward compatible code for v2.0
+
+### Changed
+- Added ellipsis (...) in debug messages longer than 80 characters
+- Changed topic constants in code
+- Prevent the SDK from saving WiFi configuration to flash
+
+### Fix
+- Issue #113. Fix light bulb state to OFF in library prevented the bulb from turning on
+- Issue #58. Added code to handle spurious readings
+- Fix bug in HLW8012 calibration current parameter casting to int instead of float
+- Issue #115. Removed local declaration of _mqttForward variable. Thanks to Paweł Fiedor
+- Fix MQTT will topic. Thanks to Asbjorn Tronhus
+
 ## [1.6.9] 2017-03-12
 ### Added
 - Two stage read for DS18B20 devices. Thanks to Izik Dubnov.
diff --git a/README.md b/README.md
index d6072609..d417036e 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ ESPurna ("spark" in Catalan) is a custom firmware for ESP8266 based smart switch
 It was originally developed with the **[IteadStudio Sonoff](https://www.itead.cc/sonoff-wifi-wireless-switch.html)** in mind but now it supports a growing number of ESP8266-based boards.
 It uses the Arduino Core for ESP8266 framework and a number of 3rd party libraries.
 
-**Current Release Version is 1.6.9**, read the [changelog](https://bitbucket.org/xoseperez/espurna/src/master/CHANGELOG.md).
+**Current Release Version is 1.7.0**, read the [changelog](https://bitbucket.org/xoseperez/espurna/src/master/CHANGELOG.md).
 
 ## Features
 
@@ -40,8 +40,10 @@ It uses the Arduino Core for ESP8266 framework and a number of 3rd party librari
     * Relay switching and sensor data from the web interface
     * Websockets-based communication between the device and the browser
     * Backup and restore settings option
+    * Upgrade firmware from the web interface
 * **REST API** (enable/disable from web interface)
     * GET and PUT relay status
+    * Change light color (for supported hardware)
     * GET sensor data (power, current, voltage, temperature and humidity) depending on the available hardware
 * **RPC API** (enable/disable from web interface)
     * Remote reset the board
@@ -65,10 +67,12 @@ Here is the list of supported hardware. For more information please refer to the
 
 ||||
 |-|-|-|
+|![Tinkerman Espurna H](images/devices/tinkerman-espurna-h.jpg)|||
+|**Tinkerman ESPurna H**|||
 |![IteadStudio S20](images/devices/s20.jpg)|![WorkChoice EcoPlug](images/devices/workchoice-ecoplug.jpg)|![IteadStudio Sonoff Touch](images/devices/sonoff-touch.jpg)|
 |**IteadStudio S20**|**WorkChoice EcoPlug**|**IteadStudio Sonoff Touch**|
-|![IteadStudio Slampher](images/devices/slampher.jpg)|![AI-Thinker Wifi Light / Noduino OpenLight](images/devices/aithinker-ailight.jpg)||
-|**IteadStudio Slampher**|**AI-Thinker Wifi Light / Noduino OpenLight**||
+|![IteadStudio Slampher](images/devices/slampher.jpg)|![AI-Thinker Wifi Light / Noduino OpenLight](images/devices/aithinker-ailight.jpg)|![Magic Home LED Controller](images/devices/magic-home-led-controller.jpg)|
+|**IteadStudio Slampher**|**AI-Thinker Wifi Light / Noduino OpenLight**|**Magic Home LED Controller**|
 |![IteadStudio Sonoff Basic](images/devices/sonoff-basic.jpg)|![IteadStudio Sonoff RF](images/devices/sonoff-rf.jpg)|![Electrodragon Relay Board](images/devices/electrodragon-relay-board.jpg)|
 |**IteadStudio Sonoff Basic**|**IteadStudio Sonoff RF**|**Electrodragon Relay Board**|
 |![IteadStudio Sonoff Dual](images/devices/sonoff-dual.jpg)|![IteadStudio Sonoff POW](images/devices/sonoff-pow.jpg)|![IteadStudio Sonoff TH10/TH16](images/devices/sonoff-th10-th16.jpg)|
diff --git a/code/espurna/config/version.h b/code/espurna/config/version.h
index 0e3ddd27..b2676ff2 100644
--- a/code/espurna/config/version.h
+++ b/code/espurna/config/version.h
@@ -1,4 +1,4 @@
 #define APP_NAME                "ESPurna"
-#define APP_VERSION             "1.7.0b"
+#define APP_VERSION             "1.7.0"
 #define APP_AUTHOR              "xose.perez@gmail.com"
 #define APP_WEBSITE             "http://tinkerman.cat"
diff --git a/images/devices/magic-home-led-controller.jpg b/images/devices/magic-home-led-controller.jpg
new file mode 100644
index 00000000..52abd8d5
Binary files /dev/null and b/images/devices/magic-home-led-controller.jpg differ
diff --git a/images/devices/tinkerman-espurna-h.jpg b/images/devices/tinkerman-espurna-h.jpg
new file mode 100644
index 00000000..9fd00ce7
Binary files /dev/null and b/images/devices/tinkerman-espurna-h.jpg differ