diff --git a/addons/io/org.openhab.io.imperihome/OSGI-INF/imperihome.xml b/addons/io/org.openhab.io.imperihome/OSGI-INF/imperihome.xml
index 485de185c3c3e..0f6ad26265e1b 100644
--- a/addons/io/org.openhab.io.imperihome/OSGI-INF/imperihome.xml
+++ b/addons/io/org.openhab.io.imperihome/OSGI-INF/imperihome.xml
@@ -9,7 +9,7 @@
     http://www.eclipse.org/legal/epl-v10.html
 
 -->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" modified="modified" configuration-policy="optional" immediate="true" name="org.openhab.imperihome">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" configuration-policy="optional" immediate="true" name="org.openhab.imperihome">
    <implementation class="org.openhab.io.imperihome.internal.ImperiHomeApiServlet"/>
    <reference bind="setHttpService" cardinality="1..1" interface="org.osgi.service.http.HttpService" name="HttpService" policy="static" unbind="unsetHttpService"/>
    <reference bind="setItemRegistry" cardinality="1..1" interface="org.eclipse.smarthome.core.items.ItemRegistry" name="ItemRegistry" policy="dynamic" unbind="unsetItemRegistry"/>
diff --git a/addons/io/org.openhab.io.imperihome/README.md b/addons/io/org.openhab.io.imperihome/README.md
index 039acdd2d6477..de269f2dfc22a 100644
--- a/addons/io/org.openhab.io.imperihome/README.md
+++ b/addons/io/org.openhab.io.imperihome/README.md
@@ -1,83 +1,112 @@
 # ImperiHome integration service
 
-This IO service exposes OpenHAB Items to the Evertygo [ImperiHome](http://www.evertygo.com/imperihome) dashboard app for Android and iOS.
-It creates a REST service at ```/imperihome/iss``` that implements the [ImperiHome Standard System API](http://dev.evertygo.com/api/iss) (ISS).
+This IO service exposes openHAB Items to the Evertygo [ImperiHome](http://www.evertygo.com/imperihome) dashboard app for Android and iOS.
+It creates a REST service at _/imperihome/iss_ that implements the [ImperiHome Standard System API](http://dev.evertygo.com/api/iss) (ISS).
 
 ## Installation
 
-At the moment the ImperiHome integration service is not part of the OpenHAB distribution and can't be installed using the Paper UI.
-If you want to try it out, [download the latest build](https://dl.dvelop.nl/oh-imperihome/) and drop the JAR file in the ```addons``` directory of OpenHAB.
+The ImperiHome integration service can be installed through the Paper UI. Navigate to Extensions &gt; Misc and click Install.
 
 ## Configuration
 
-The service itself has no configuration. ImperiHome on the other hand must be configured to connect to your OpenHAB instance.
+The service itself has no configuration. ImperiHome on the other hand must be configured to connect to your openHAB instance.
 
-Start ImperiHome, open the menu and go to My Systems. Add a new system (+) and choose 'ImperiHome Standard System' as the object type. Now enter the URL to your OpenHAB instance
- as Local URL, followed by ```/imperihome/iss```. For example, if your OH instance is running at ```http://192.168.1.10:8080/```, the Local URL would be ```http://192.168.1.10:8080/imperihome/iss```. 
+Start ImperiHome, open the menu and go to My Systems. Add a new system (+) and choose 'ImperiHome Standard System' as the object type. Now enter the URL to your openHAB instance
+ as Local URL, followed by _/imperihome/iss_. For example, if your OH instance is running at _http://192.168.1.10:8080/_, the Local URL would be _http://192.168.1.10:8080/imperihome/iss_. 
 
 If you have port forwarding or similar set up to access your OH form the internet, you can also fill the Remote URL in the same way. For example: 
-```http://my-openhab-url.dyndns.org:8080/imperihome/iss```. Please be aware that this service provides no authentication mechanism, so anyone could use the API to control your 
+_http://my-openhab-url.dyndns.org:8080/imperihome/iss_. Please be aware that this service provides no authentication mechanism, so anyone could use the API to control your 
 system when accessible from the internet.
 
 Click Next to let ImperiHome validate the URL. After validation succeeded the system is added and you can continue to configure your Items for use in ImperiHome.
 
 ## Device Tagging
-Similar to the Hue Emulation service, this service uses Item tags to determine how to expose your Items to ImperiHome.
-All tags are formatted ```iss:<tagtype>:<value>```. For example: ```iss:room:Kitchen```.
 
-If you've defined your Items in ```.items``` files, tags can be added using the ```[ "mytag" ]``` syntax (after the ```(Groups)``` and before the ```{channel}```). If you 
-created your items another way, e.g. using the Paper UI, [HABmin](https://github.com/openhab/org.openhab.ui.habmin) allows you to modify the tags. 
+This service uses Item tags to determine how to expose your Items to ImperiHome. All tags are formatted like this: 
+
+```iss:<tagtype>:<value>```
+ 
+For example: 
+
+```iss:room:Kitchen```
+
+If you've defined your Items in _.items_ files, tags can be added using the 
+
+```[ "mytag" ]``` 
+
+syntax (after the _(Groups)_ and before the _{channel}_). 
+If you created your items another way, e.g. using the Paper UI, [HABmin](https://github.com/openhab/org.openhab.ui.habmin) allows you to modify the tags. 
+
+### Tag: _type_
 
-### Tag: ```type```
 Specifies the device type to expose to ImperiHome. Take a look at [Device types](#deviceTypes) below for the supported device types and how to configure them.
 If no type is specified, this service will try to auto-detect the type from the Item, based on supported value types (OnOff for a switch, HSB for color light) and Item name.
 
 _Required_: no<br>
 _Default_: auto-detect<br>
-Example: ```iss:type:DevSwitch```
+Example: 
+
+```iss:type:DevSwitch```
+
+### Tag: _room_
 
-### Tag: ```room```
 Specifies the room the device will show up in in ImperiHome.
 
 _Required_: no<br>
 _Default_: 'No Room'<br>
-_Example_: ```iss:room:Kitchen```
+_Example_: 
+
+```iss:room:Kitchen```
+
+### Tag: _label_
 
-### Tag: ```label```
 Sets the device label in ImperiHome. If no label is specified, the Item label is used if available. Otherwise the Item name will be used.
 
 _Required_: no<br>
 _Default_:  Item label or name<br>
-_Example_: ```iss:label:Kitchen light```
+_Example_: 
+
+```iss:label:Kitchen light```
+
+### Tag: _mapping_
 
-### Tag: ```mapping```
-Sets the mapping for a ImperiHome MultiSwitch device, just like an OpenHAB sitemap mapping does. 
+Sets the mapping for a ImperiHome MultiSwitch device, just like an openHAB sitemap mapping does. 
 In the example below, 'All off', 'Relax' and 'Reading' will be visible in ImperiHome. Clicking one of the options will send
-a 0, 1 or 2 value command to the OpenHAB item.
+a 0, 1 or 2 value command to the openHAB item.
 
 _Required_: only for MultiSwitch device<br>
 _Default_: none<br>
-_Example_: ```iss:mapping:0=All off,1=Relax,2=Reading```
+_Example_: 
+
+```iss:mapping:0=All off,1=Relax,2=Reading```
+
+### Tag: _link_
 
-### Tag: ```link```
 Links two devices together, using the value from the linked device as an additional value in the device containing the link tag.
 See [Device links](#deviceLinks) for details.
 
 _Required_: no<br>
 _Default_: none<br>
-_Example_: ```iss:link:energy:Kitchen_Current_Consumption```
+_Example_: 
+
+```iss:link:energy:Kitchen_Current_Consumption```
+
+### Tag: _unit_
 
-### Tag: ```unit```
-Sets the unit for devices with a numeric value, such as ```DevTemperature``` and ```DevGenericSensor```.
+Sets the unit for devices with a numeric value, such as _DevTemperature_ and _DevGenericSensor_.
 The unit is only used to tell ImperiHome what to display; no conversion is performed.
 
 _Required_: no<br>
 _Default_: none<br>
-_Example_: ```iss:unit:°C```
+_Example_: 
+
+```iss:unit:°C```
 
 <a name="deviceTypes"></a> 
+
 ## Device types
-The following table lists the ImperiHome API device types that you can use in a ```iss:type``` tag. Not all device types are currently supported. For those that are supported, 
+
+The following table lists the ImperiHome API device types that you can use in a _iss:type_ tag. Not all device types are currently supported. For those that are supported, 
 the Item types you can use them on are listed.
 
 <table>
@@ -289,15 +318,18 @@ the Item types you can use them on are listed.
 <sup>(1)</sup> When using a String Item for trippable devices, any non-empty value other than 'ok' will set the device to tripped. This makes it compatible with the Nest Protect binding.  
 
 <a name="deviceLinks"></a> 
+
 ## Device links
+
 Some devices can be linked to another device. This allows you to create combined devices reporting multiple values, or reporting the energy consumption with a switch device.
 
-The ```link``` tag refers to the name of the Item it should link to. The item must be an ImperiHome device itself, so it must have at least one ```iss``` tag.
+The _link_ tag refers to the name of the Item it should link to. The item must be an ImperiHome device itself, so it must have at least one _iss_ tag.
 
 ### Switch energy consumption
-ImperiHome allows you to show the current energy consumption for a ```DevDimmer```, ```DevRGBLight``` and ```DevSwitch```. 
-This example links the ```MyLight_Energy``` Number Item to the ```MyLight``` Switch Item, 
-so the ```DevSwitch``` device will also report the energy consumption value to ImperiHome:
+
+ImperiHome allows you to show the current energy consumption for a _DevDimmer_, _DevRGBLight_ and _DevSwitch_. 
+This example links the _MyLight_Energy_ Number Item to the _MyLight_ Switch Item, 
+so the _DevSwitch_ device will also report the energy consumption value to ImperiHome:
   
 ```
 Switch  MyLight        "My Light"                  ["iss:type:DevSwitch", "iss:link:energy:MyLight_Energy"] { channel="zwave:device:1:node14:switch_binary1" }
@@ -305,43 +337,53 @@ Number  MyLight_Energy "My Light Usage [%.1f W]"   ["iss:type:DevElectricity"]
 ```
 
 ### Total energy consumption
-The ```DevElectricity``` devices main value is the current consumption in Watts. To add the total consumption in KWh, link your electricity device to
+
+The _DevElectricity_ devices main value is the current consumption in Watts. To add the total consumption in KWh, link your electricity device to
 a generic sensor device containing the total energy consumption value:
+
 ```
 Number  MyLight_Energy        "My Light Usage [%.1f W]"          ["iss:type:DevElectricity", "iss:link:kwh:MyLight_Total_Energy"]  { channel="zwave:device:1:node14:meter_watts1" }
 Number  MyLight_Total_Energy  "My Light Total usage [%.1f KWh]"  ["iss:type:DevGenericSensor", "iss:unit:KWh"]                     { channel="zwave:device:1:node14:sensor_power1" }
 ```
 
 ### TempHygro
-ImperiHome recognizes the special ```DevTempHygro``` device, combining a temperature and hydrometry sensor. You can create such a device by linking either from a temperature Item to a hygro Item:
+
+ImperiHome recognizes the special _DevTempHygro_ device, combining a temperature and hydrometry sensor. You can create such a device by linking either from a temperature Item to a hygro Item:
+
 ```
 Number  MyTemp  "Temperature [%.1f °C]" ["iss:type:DevTempHygro", "iss:link:hygro:MyHum"]  { channel="zwave:device:1:node8:sensor_temperature" }
 Number  MyHum   "Humidity [%d%%]"       ["iss:type:DevHygrometry"]                         { channel="zwave:device:1:node8:sensor_relhumidity" }
 ```
 
 or vise versa:
+
 ```
 Number  MyTemp  "Temperature [%.1f °C]" ["iss:type:DevTemperature"]                        { channel="zwave:device:1:node8:sensor_temperature" }
 Number  MyHum   "Humidity [%d%%]"       ["iss:type:DevTempHygro", "iss:link:temp:MyTemp"]  { channel="zwave:device:1:node8:sensor_relhumidity" }
 ```
 
 ### Rain accumulation
-The ```DevRain``` devices main value is the current instant rain value (default in mm per hour). To add the total rain accumulation value, link your rain device to
+
+The _DevRain_ devices main value is the current instant rain value (default in mm per hour). To add the total rain accumulation value, link your rain device to
 a generic sensor device:
+
 ```
 Number  RainCurrent       "Rain current [%.1f mm/h]"     ["iss:type:DevRain", "iss:link:accum:RainAccumulation"]  { channel="..." }
 Number  RainAccumulation  "Rain accumulation [%.1f mm]"  ["iss:type:DevGenericSensor", "iss:unit:mm"]             { channel="..." }
 ```
 
 ### Wind direction
-The ```DevWind``` devices main value is the current wind speed (default in km per hour). To add the wind direction value (default in degrees), link your wind device to
+
+The _DevWind_ devices main value is the current wind speed (default in km per hour). To add the wind direction value (default in degrees), link your wind device to
 a generic sensor device:
+
 ```
 Number  WindSpeed      "Wind speed [%.1f km/h]"   ["iss:type:DevWind", "iss:link:direction:WindDirection"]  { channel="..." }
 Number  WindDirection  "Wind direction [%d deg]"  ["iss:type:DevGenericSensor", "iss:unit:deg"]             { channel="..." }
 ```
 
 ## Items example
+
 ```
 Color   LVR_Billy            "Billy"          <colorlight>    (Lights)       ["iss:room:Living room", "iss:type:DevRGBLight"]    { channel="hue:0210:001122334455:bulb1:color" }
 Switch  LVR_TallLamp         "Tall lamp"                      (Lights)       ["iss:room:Living room", "iss:type:DevSwitch"]      { channel="zwave:device:1:node3:switch_binary" }
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/ImperiHomeApiServlet.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/ImperiHomeApiServlet.java
index ced4233b27e10..22b02607c01ed 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/ImperiHomeApiServlet.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/ImperiHomeApiServlet.java
@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright (c) 2014-2016 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
@@ -47,7 +47,7 @@
 
 /**
  * Main OSGi service and HTTP servlet for ImperiHome integration.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class ImperiHomeApiServlet extends HttpServlet {
 
@@ -96,10 +96,6 @@ public ImperiHomeApiServlet() {
      * @param config Service config.
      */
     protected void activate(Map<String, Object> config) {
-        LOGGER.info("Starting ImperiHome integration service");
-
-        modified(config);
-
         systemHandler = new SystemHandler();
         deviceRegistry = new DeviceRegistry();
         actionRegistry = new ActionRegistry(eventPublisher);
@@ -118,17 +114,11 @@ protected void activate(Map<String, Object> config) {
         }
     }
 
-    protected void modified(Map<String, ?> config) {
-
-    }
-
     /**
      * OSGi deactivation callback.
      * @param componentContext Context.
      */
     protected void deactivate(ComponentContext componentContext) {
-        LOGGER.info("Stopping ImperiHome integration service");
-
         try {
             httpService.unregister(PATH);
         } catch (IllegalArgumentException ignored) {
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/Action.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/Action.java
index a6f684fc3e5de..75ebaa525b9ef 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/Action.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/Action.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.action;
 
 import org.eclipse.smarthome.core.events.EventPublisher;
@@ -6,7 +14,7 @@
 
 /**
  * Abstract action, called through the API by ImperiHome clients.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public abstract class Action {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/ActionRegistry.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/ActionRegistry.java
index 7a48a20194a4d..ea87ce51155e8 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/ActionRegistry.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/ActionRegistry.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.action;
 
 import java.util.HashMap;
@@ -7,7 +15,7 @@
 
 /**
  * Action registry. Maps ImperiHome API action name to {@link Action} implementation.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class ActionRegistry {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/LaunchSceneAction.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/LaunchSceneAction.java
index a4c626b0215f4..9246a6d54e30a 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/LaunchSceneAction.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/LaunchSceneAction.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.action;
 
 import java.util.List;
@@ -13,7 +21,7 @@
 
 /**
  * Action performed on a DevScene. Sends an {@link OnOffType#ON} or {@link DecimalType} 1 to the Item.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class LaunchSceneAction extends Action {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/SetChoiceAction.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/SetChoiceAction.java
index 1b2b1a59c24b2..e2bdc7b3d2841 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/SetChoiceAction.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/SetChoiceAction.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.action;
 
 import java.util.Map;
@@ -15,7 +23,7 @@
 
 /**
  * Action setting a choice from a selection list, e.g. MultiSwitch.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class SetChoiceAction extends Action {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/SetColorAction.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/SetColorAction.java
index 18a8517f42fbb..d96c4b79bda63 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/SetColorAction.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/SetColorAction.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.action;
 
 import org.eclipse.smarthome.core.events.EventPublisher;
@@ -11,7 +19,7 @@
 
 /**
  * Items setting RGB color value.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class SetColorAction extends Action {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/SetLevelAction.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/SetLevelAction.java
index 7705c412251a0..e2617a809f0d0 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/SetLevelAction.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/SetLevelAction.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.action;
 
 import org.eclipse.smarthome.core.events.EventPublisher;
@@ -9,7 +17,7 @@
 
 /**
  * Action setting percentage level, e.g. dimmer.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class SetLevelAction extends Action {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/SetStatusAction.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/SetStatusAction.java
index 98a5d561ba88d..cc8d04f5a7edc 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/SetStatusAction.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/action/SetStatusAction.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.action;
 
 import java.util.Objects;
@@ -11,7 +19,7 @@
 
 /**
  * Action setting device status to 1 or 0.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class SetStatusAction extends Action {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/DeviceActionHandler.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/DeviceActionHandler.java
index 3750403cc6604..24fb27f450987 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/DeviceActionHandler.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/DeviceActionHandler.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.handler;
 
 import java.io.UnsupportedEncodingException;
@@ -13,7 +21,7 @@
 
 /**
  * Device action request handler.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class DeviceActionHandler {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/DeviceHistoryHandler.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/DeviceHistoryHandler.java
index 37233b011ac99..d24fe7cdb752b 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/DeviceHistoryHandler.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/DeviceHistoryHandler.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.handler;
 
 import java.io.UnsupportedEncodingException;
@@ -26,7 +34,7 @@
 
 /**
  * Device history request handler.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class DeviceHistoryHandler {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/DevicesListHandler.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/DevicesListHandler.java
index cf2b046eb0c0f..13de0c0dd0ad6 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/DevicesListHandler.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/DevicesListHandler.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.handler;
 
 import java.util.Collection;
@@ -12,7 +20,7 @@
 
 /**
  * Device list request handler.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class DevicesListHandler {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/RoomListHandler.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/RoomListHandler.java
index 681d246517b47..0e18af9970aa1 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/RoomListHandler.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/RoomListHandler.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.handler;
 
 import javax.servlet.http.HttpServletRequest;
@@ -7,7 +15,7 @@
 
 /**
  * Rooms list request handler.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class RoomListHandler {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/SystemHandler.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/SystemHandler.java
index 9c0144be060ec..c9ca28b5bae71 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/SystemHandler.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/handler/SystemHandler.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.handler;
 
 import javax.servlet.http.HttpServletRequest;
@@ -7,7 +15,7 @@
 
 /**
  * System data request handler.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class SystemHandler {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/io/DeviceParametersSerializer.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/io/DeviceParametersSerializer.java
index 6bb01c2af9a1e..5602d6f55ab03 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/io/DeviceParametersSerializer.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/io/DeviceParametersSerializer.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.io;
 
 import java.lang.reflect.Type;
@@ -12,7 +20,7 @@
 
 /**
  * Serializer for {@link DeviceParameters}.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class DeviceParametersSerializer implements JsonSerializer<DeviceParameters> {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/io/DeviceTypeSerializer.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/io/DeviceTypeSerializer.java
index cf4203840de39..7cc30ed99092f 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/io/DeviceTypeSerializer.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/io/DeviceTypeSerializer.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.io;
 
 import java.lang.reflect.Type;
@@ -11,7 +19,7 @@
 
 /**
  * Serializer for {@link DeviceType}.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class DeviceTypeSerializer implements JsonSerializer<DeviceType> {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/io/ParamTypeSerializer.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/io/ParamTypeSerializer.java
index 93b34734515a2..638005fe985c0 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/io/ParamTypeSerializer.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/io/ParamTypeSerializer.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.io;
 
 import java.lang.reflect.Type;
@@ -11,7 +19,7 @@
 
 /**
  * Serializer for {@link ParamType}.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class ParamTypeSerializer implements JsonSerializer<ParamType> {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/HistoryItem.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/HistoryItem.java
index 2ebfd6f9e27fd..5b4c789f600d1 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/HistoryItem.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/HistoryItem.java
@@ -1,10 +1,18 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model;
 
 import java.util.Date;
 
 /**
  * History item data object.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class HistoryItem {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/HistoryList.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/HistoryList.java
index 5d1c560a6329b..f71d4af46d260 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/HistoryList.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/HistoryList.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model;
 
 import java.util.LinkedList;
@@ -5,7 +13,7 @@
 
 /**
  * History list data object.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class HistoryList {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/Room.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/Room.java
index 855efaca12169..b979a42a27345 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/Room.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/Room.java
@@ -1,8 +1,16 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model;
 
 /**
  * Room data object.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class Room {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/RoomList.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/RoomList.java
index d00b3f501eefa..1532833337110 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/RoomList.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/RoomList.java
@@ -1,10 +1,18 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model;
 
 import java.util.Collection;
 
 /**
  * Room list data object.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class RoomList {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/System.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/System.java
index 193aff502b72a..d5e1b6aad4ac6 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/System.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/System.java
@@ -1,8 +1,16 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model;
 
 /**
  * System data object.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class System {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/AbstractDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/AbstractDevice.java
index bfce7a1857ad1..41ae0116bad28 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/AbstractDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/AbstractDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import java.util.HashMap;
@@ -19,7 +27,7 @@
 
 /**
  * Abstract parent of all devices. Sets up and tears down state listeners and contains parameter and link data.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public abstract class AbstractDevice implements StateChangeListener {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/AbstractEnergyLinkDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/AbstractEnergyLinkDevice.java
index a531ec210f930..4f407a01c574b 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/AbstractEnergyLinkDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/AbstractEnergyLinkDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.eclipse.smarthome.core.items.Item;
@@ -7,7 +15,7 @@
 
 /**
  * Abstraction of devices that allow a link to a current energy consumption item.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public abstract class AbstractEnergyLinkDevice extends AbstractDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/AbstractNumericValueDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/AbstractNumericValueDevice.java
index f8562a279e78e..0ba6722cb5047 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/AbstractNumericValueDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/AbstractNumericValueDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.eclipse.smarthome.core.items.Item;
@@ -5,7 +13,7 @@
 
 /**
  * Parent of devices with a {@link NumericValueParam}. Contains the value unit.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public abstract class AbstractNumericValueDevice extends AbstractDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/Co2SensorDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/Co2SensorDevice.java
index 7651f8ebaf7e1..b37a09f3e5c34 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/Co2SensorDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/Co2SensorDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.eclipse.smarthome.core.items.Item;
@@ -8,7 +16,7 @@
 
 /**
  * CO2 sensor device.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class Co2SensorDevice extends AbstractNumericValueDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/DeviceList.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/DeviceList.java
index d3135e8f5a532..52ab49e24f03b 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/DeviceList.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/DeviceList.java
@@ -1,10 +1,18 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import java.util.Collection;
 
 /**
  * Device list holder.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class DeviceList {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/DeviceType.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/DeviceType.java
index cfc0e31f19cdb..59118a82f19d9 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/DeviceType.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/DeviceType.java
@@ -1,8 +1,16 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 /**
  * Device type enumeration. Contains ImperiHome API type strings.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public enum DeviceType {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/DimmerDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/DimmerDevice.java
index 87dd274e88362..d0ac882decc76 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/DimmerDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/DimmerDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.eclipse.smarthome.core.items.Item;
@@ -8,7 +16,7 @@
 
 /**
  * Dimmer device, containing on/off status and dim level.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class DimmerDevice extends AbstractEnergyLinkDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/ElectricityDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/ElectricityDevice.java
index 8bdeb99551885..acdfc361fd73b 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/ElectricityDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/ElectricityDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.apache.commons.lang.StringUtils;
@@ -12,7 +20,7 @@
 
 /**
  * Electricity device, containing current (Watt) and total (KWh) consumption.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class ElectricityDevice extends AbstractNumericValueDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/GenericSensorDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/GenericSensorDevice.java
index 9d12c15cfaa95..7e77ab6e84bc5 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/GenericSensorDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/GenericSensorDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.eclipse.smarthome.core.items.Item;
@@ -8,7 +16,7 @@
 
 /**
  * Generic sensor device.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class GenericSensorDevice extends AbstractNumericValueDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/HygrometryDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/HygrometryDevice.java
index 001e7a41e0dbf..494d85dfaae4d 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/HygrometryDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/HygrometryDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.eclipse.smarthome.core.items.Item;
@@ -8,7 +16,7 @@
 
 /**
  * Hygrometry sensor device.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class HygrometryDevice extends AbstractNumericValueDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/LuminosityDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/LuminosityDevice.java
index 7e66ef2af3c2e..85fc599128d4f 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/LuminosityDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/LuminosityDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.eclipse.smarthome.core.items.Item;
@@ -8,7 +16,7 @@
 
 /**
  * Luminosity sensor device.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class LuminosityDevice extends AbstractNumericValueDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/MultiSwitchDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/MultiSwitchDevice.java
index 6c47fa15bb454..bec949792a544 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/MultiSwitchDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/MultiSwitchDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import java.util.Map;
@@ -12,7 +20,7 @@
 
 /**
  * MultiSwitch device, mimics behavior of a OH Switch with a mapping.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class MultiSwitchDevice extends AbstractDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/NoiseDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/NoiseDevice.java
index fd77c1d80c45c..3b3f5cbd89dfa 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/NoiseDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/NoiseDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.eclipse.smarthome.core.items.Item;
@@ -8,7 +16,7 @@
 
 /**
  * Noise sensor device.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class NoiseDevice extends AbstractNumericValueDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/PressureDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/PressureDevice.java
index b5cad63b0220c..c2871dfea6851 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/PressureDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/PressureDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.eclipse.smarthome.core.items.Item;
@@ -8,7 +16,7 @@
 
 /**
  * Pressure sensor device.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class PressureDevice extends AbstractNumericValueDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/RainDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/RainDevice.java
index 2cba3ba61b5a0..9b322f1a65ad4 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/RainDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/RainDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.apache.commons.lang.StringUtils;
@@ -10,7 +18,7 @@
 
 /**
  * Rain sensor device.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class RainDevice extends AbstractNumericValueDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/RgbLightDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/RgbLightDevice.java
index 9dc256ca74a2b..77a5b2f7e94c9 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/RgbLightDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/RgbLightDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import java.math.BigDecimal;
@@ -12,7 +20,7 @@
 
 /**
  * RGB light device.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class RgbLightDevice extends AbstractEnergyLinkDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/SceneDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/SceneDevice.java
index ac9525d88a5a8..6aa16ed7a325c 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/SceneDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/SceneDevice.java
@@ -1,10 +1,18 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.eclipse.smarthome.core.items.Item;
 
 /**
  * Scene activation device.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class SceneDevice extends AbstractDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/SwitchDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/SwitchDevice.java
index 0b403ab840406..1d9346dfa0e54 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/SwitchDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/SwitchDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.eclipse.smarthome.core.items.Item;
@@ -8,7 +16,7 @@
 
 /**
  * Simple on/off switch device.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class SwitchDevice extends AbstractEnergyLinkDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/TempHygroDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/TempHygroDevice.java
index f2d9f308f111b..f1774ce2138c3 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/TempHygroDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/TempHygroDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.eclipse.smarthome.core.items.Item;
@@ -12,7 +20,7 @@
 /**
  * Combined temperature/hygro sensor device. Can be specified on either a temp or hygro Item, with a link to the other one.
  * The linked value will be retrieved in {@link #updateParams()}.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class TempHygroDevice extends AbstractNumericValueDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/TemperatureDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/TemperatureDevice.java
index 3b7c85ad80a5e..021f6f4b7d8e3 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/TemperatureDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/TemperatureDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.eclipse.smarthome.core.items.Item;
@@ -8,7 +16,7 @@
 
 /**
  * Temperature sensor device.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class TemperatureDevice extends AbstractNumericValueDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/TrippableDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/TrippableDevice.java
index fc5fb0aeff905..5b77af440a475 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/TrippableDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/TrippableDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import java.util.List;
@@ -14,7 +22,7 @@
 
 /**
  * Abstraction of devices that are trippable, i.e. DevDoor, DevFlood, DevMotion, DevSmoke, DevCO2Alert.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class TrippableDevice extends AbstractDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/UvDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/UvDevice.java
index a9552ca8b73ea..a921957af5800 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/UvDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/UvDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.eclipse.smarthome.core.items.Item;
@@ -8,7 +16,7 @@
 
 /**
  * UV sensor device.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class UvDevice extends AbstractNumericValueDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/WindDevice.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/WindDevice.java
index 62f56f022c1fe..da46737ec113a 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/WindDevice.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/device/WindDevice.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.device;
 
 import org.apache.commons.lang.StringUtils;
@@ -10,7 +18,7 @@
 
 /**
  * Wind sensor device.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class WindDevice extends AbstractNumericValueDevice {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/param/DeviceParam.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/param/DeviceParam.java
index 4b493f4a908a8..29cb5fdbc5b62 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/param/DeviceParam.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/param/DeviceParam.java
@@ -1,8 +1,16 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.param;
 
 /**
  * Basic device key/value parameter.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class DeviceParam {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/param/DeviceParameters.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/param/DeviceParameters.java
index 29b8221b9fe6e..78cd91c91d34b 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/param/DeviceParameters.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/param/DeviceParameters.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.param;
 
 import java.util.HashMap;
@@ -5,7 +13,7 @@
 /**
  * No-op extension of HashMap storing device parameters. This class exists because it allows the use of a Map in Device and at the same
  * time makes it possible to expose the values as a JSON array using a custom serializer.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class DeviceParameters extends HashMap<ParamType, DeviceParam> {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/param/NumericValueParam.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/param/NumericValueParam.java
index 46d8647e1bfcd..ff6a71d083f1a 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/param/NumericValueParam.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/param/NumericValueParam.java
@@ -1,10 +1,18 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.param;
 
 import org.eclipse.smarthome.core.library.types.DecimalType;
 
 /**
  * Numeric value param
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class NumericValueParam extends DeviceParam {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/param/ParamType.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/param/ParamType.java
index 950de67c62d07..64e1074bbb6d4 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/param/ParamType.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/model/param/ParamType.java
@@ -1,8 +1,16 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.model.param;
 
 /**
  * Parameter type enumeration. Contains the ISS API parameter key string.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public enum ParamType {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/processor/DeviceRegistry.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/processor/DeviceRegistry.java
index 9afa4c4744c81..8797f2dcada22 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/processor/DeviceRegistry.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/processor/DeviceRegistry.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.processor;
 
 import java.util.Collection;
@@ -13,7 +21,7 @@
 
 /**
  * The device registry stores created devices by ID.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public class DeviceRegistry implements Iterable<AbstractDevice> {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/processor/ItemProcessor.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/processor/ItemProcessor.java
index 3fd5051fda0d7..a61b5e3793d98 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/processor/ItemProcessor.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/processor/ItemProcessor.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.processor;
 
 import java.util.Collection;
@@ -22,8 +30,8 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Processor of OpenHAB Items. Parses ISS tags and creates and registers {@link AbstractDevice} implementations where applicable.
- * @author pdegeus
+ * Processor of openHAB Items. Parses ISS tags and creates and registers {@link AbstractDevice} implementations where applicable.
+ * @author Pepijn de Geus - Initial contribution
  */
 public class ItemProcessor implements ItemRegistryChangeListener {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/processor/TagType.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/processor/TagType.java
index 521d4e5cabdb1..e5baa2ca4f1c0 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/processor/TagType.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/processor/TagType.java
@@ -1,8 +1,16 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.processor;
 
 /**
  * ISS tag types enumeration.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public enum TagType {
 
diff --git a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/util/DigestUtil.java b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/util/DigestUtil.java
index aeb8747fe56c6..ef86fdfdb6cc9 100644
--- a/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/util/DigestUtil.java
+++ b/addons/io/org.openhab.io.imperihome/src/main/java/org/openhab/io/imperihome/internal/util/DigestUtil.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2014-2016 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.openhab.io.imperihome.internal.util;
 
 import java.io.UnsupportedEncodingException;
@@ -7,7 +15,7 @@
 
 /**
  * Digest utility.
- * @author pdegeus
+ * @author Pepijn de Geus - Initial contribution
  */
 public final class DigestUtil {
 
diff --git a/features/openhab-addons/src/main/feature/feature.xml b/features/openhab-addons/src/main/feature/feature.xml
index 03d3980d884e7..2581314c4fd98 100644
--- a/features/openhab-addons/src/main/feature/feature.xml
+++ b/features/openhab-addons/src/main/feature/feature.xml
@@ -252,6 +252,12 @@
         <bundle start-level="80">mvn:org.openhab.io/org.openhab.io.homekit/${project.version}</bundle>
     </feature>
 
+    <feature name="openhab-misc-imperihome" description="ImperiHome Integration" version="${project.version}">
+        <feature>openhab-runtime-base</feature>
+        <feature>esh-model-item</feature>
+        <bundle start-level="80">mvn:org.openhab.io/org.openhab.io.imperihome/${project.version}</bundle>
+    </feature>
+
     <!-- voice -->
 
     <feature name="openhab-voice-kaldi" description="Kaldi Speech-to-Text" version="${project.version}">