diff --git a/source/_components/binary_sensor.markdown b/source/_components/binary_sensor.markdown
index 82f2a1bb95..477642ec95 100644
--- a/source/_components/binary_sensor.markdown
+++ b/source/_components/binary_sensor.markdown
@@ -9,7 +9,8 @@ sharing: true
 footer: true
 ---
 
-Binary sensors are gathering information about state of switches, contacts, pins, and alike. The return value of those sensors is usually digital (1/0). This means that those sensors knows only two states: **off/low/open*** and ***on/high/closed**.
+Binary sensors are gathering information about state of switches, contacts, pins, and alike. The return value of those sensors is usually digital (1/0). This means that those sensors knows only two states: **off/low/open** and **on/high/closed**.
+
+Knowing that there are only two states allows Home Assistant to represent the sensor better in the frontend.
 
 For analog sensors please check the [component overview](https://home-assistant.io/components/#sensor).
-
diff --git a/source/_components/influxdb.markdown b/source/_components/influxdb.markdown
new file mode 100644
index 0000000000..0ad7186a69
--- /dev/null
+++ b/source/_components/influxdb.markdown
@@ -0,0 +1,31 @@
+---
+layout: component
+title: "InfluxDB"
+description: "Record events in InfluxDB."
+date: 2015-12-6 13:08
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: influxdb.png
+ha_category: Other
+---
+
+This component will allow you to record events to an InfluxDB database.
+
+<p class='note warning'>
+If you use Home Assistant 0.9, load this component as `influx`.
+</p>
+
+```yaml
+# Example configuration.yaml entry
+influxdb:
+  host: DB_HOST_IP_ADDRESS
+  # Optional, default: 8086
+  port: 20000
+  # Optional, default: home_assistant
+  database: DB_TO_STORE_EVENTS
+  # Optional
+  username: MY_USER
+  password: MY_PASS
+```
diff --git a/source/_components/mqtt.markdown b/source/_components/mqtt.markdown
index e01d5016ce..88a02f500f 100644
--- a/source/_components/mqtt.markdown
+++ b/source/_components/mqtt.markdown
@@ -141,3 +141,25 @@ For reading all messages sent on the topic `home-assistant` to a broker running
 ```bash
 $ mosquitto_sub -h 127.0.0.1 -v -t "home-assistant/#"
 ```
+
+## {% linkable_title Processing JSON %}
+
+The MQTT switch and sensor platforms support processing JSON over MQTT messages and parse them using JSONPath. JSONPath allows you to specify where in the JSON the value resides that you want to use. The following examples will always return the value `100`.
+
+| JSONPath query | JSON |
+| -------------- | ---- |
+| `somekey` | `{ 'somekey': 100 }`
+| `somekey[0]` | `{ 'somekey': [100] }`
+| `somekey[0].value` | `{ 'somekey': [ { value: 100 } ] }`
+
+To use this, add the following key to your `configuration.yaml`:
+
+```yaml
+switch:
+  platform: mqtt
+  state_format: 'json:somekey[0].value'
+```
+
+More information about the full JSONPath syntax can be found [here][JSONPath syntax].
+
+[JSONPath syntax]: https://github.com/kennknowles/python-jsonpath-rw#jsonpath-syntax
\ No newline at end of file
diff --git a/source/_components/thermostat.homematic.markdown b/source/_components/thermostat.homematic.markdown
index b2a5867dc5..b281ec4184 100644
--- a/source/_components/thermostat.homematic.markdown
+++ b/source/_components/thermostat.homematic.markdown
@@ -22,7 +22,7 @@ thermostat:
   address: HOMEGEAR/CCU_ADDRESS
   devices:
     Livingroom 1:
-      id: DEVICE_SERIAL_NO 
+      id: DEVICE_SERIAL_NO
     Livingroom 2:
       id: DEVICE_SERIAL_NO
 ```
diff --git a/source/images/supported_brands/ecobee.png b/source/images/supported_brands/ecobee.png
index 6843a4b1c3..bcc58fabc5 100644
Binary files a/source/images/supported_brands/ecobee.png and b/source/images/supported_brands/ecobee.png differ
diff --git a/source/images/supported_brands/influxdb.png b/source/images/supported_brands/influxdb.png
new file mode 100644
index 0000000000..209adc4101
Binary files /dev/null and b/source/images/supported_brands/influxdb.png differ