diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b15478..0fe23e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased 
 
+## [1.1.6] - 2021-02-06
+### Changed
+- Change interuppted behaviour in ``EBusLowLevelController`` thread
+- Enhance @Null check in ``EBusDeviceTableService``
+- Simplified checks due to safe @Null checks
+
 ## [1.1.5] - 2021-01-31
 ### Changed
 - Removed clone() from DataType objects
diff --git a/pom.xml b/pom.xml
index ff8a96b..f3df02e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 	<description>eBUS core library - This library handles the communication with heating engineering via the BUS specification. This protocol is used by many heating manufacturers in Europe.</description>
 	<groupId>de.cs-dev.ebus</groupId>
 	<artifactId>ebus-core</artifactId>
-	<version>1.1.5</version>
+	<version>1.1.6</version>
 	<url>https://github.com/csowada/ebus</url>
 	<packaging>bundle</packaging>
 
@@ -17,7 +17,7 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.release>8</maven.compiler.release>
-		<license.year>2020</license.year>
+		<license.year>2021</license.year>
 		<bundle.version>${project.version}</bundle.version>
 		<sonar.projectKey>csowada_ebus</sonar.projectKey>
 		<sonar.organization>csowada</sonar.organization>
diff --git a/src/etc/header.txt b/src/etc/header.txt
index 196515a..482f4be 100644
--- a/src/etc/header.txt
+++ b/src/etc/header.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2016-${year} by the respective copyright holders.
+Copyright (c) 2017-${year} 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
diff --git a/src/main/java/de/csdev/ebus/cfg/EBusConfigurationReaderException.java b/src/main/java/de/csdev/ebus/cfg/EBusConfigurationReaderException.java
index 7399114..9de8112 100644
--- a/src/main/java/de/csdev/ebus/cfg/EBusConfigurationReaderException.java
+++ b/src/main/java/de/csdev/ebus/cfg/EBusConfigurationReaderException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/cfg/IEBusConfigurationProvider.java b/src/main/java/de/csdev/ebus/cfg/IEBusConfigurationProvider.java
index 1d53d56..b23ea6b 100644
--- a/src/main/java/de/csdev/ebus/cfg/IEBusConfigurationProvider.java
+++ b/src/main/java/de/csdev/ebus/cfg/IEBusConfigurationProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/cfg/IEBusConfigurationReader.java b/src/main/java/de/csdev/ebus/cfg/IEBusConfigurationReader.java
index 6be9250..dbd6067 100644
--- a/src/main/java/de/csdev/ebus/cfg/IEBusConfigurationReader.java
+++ b/src/main/java/de/csdev/ebus/cfg/IEBusConfigurationReader.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/cfg/std/EBusConfigurationReader.java b/src/main/java/de/csdev/ebus/cfg/std/EBusConfigurationReader.java
index 18bb83c..f4ac1a1 100644
--- a/src/main/java/de/csdev/ebus/cfg/std/EBusConfigurationReader.java
+++ b/src/main/java/de/csdev/ebus/cfg/std/EBusConfigurationReader.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/cfg/std/EBusValueJsonDeserializer.java b/src/main/java/de/csdev/ebus/cfg/std/EBusValueJsonDeserializer.java
index 86fd388..a5c20fd 100644
--- a/src/main/java/de/csdev/ebus/cfg/std/EBusValueJsonDeserializer.java
+++ b/src/main/java/de/csdev/ebus/cfg/std/EBusValueJsonDeserializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/cfg/std/dto/EBusCollectionDTO.java b/src/main/java/de/csdev/ebus/cfg/std/dto/EBusCollectionDTO.java
index 545a0f4..d8a3726 100644
--- a/src/main/java/de/csdev/ebus/cfg/std/dto/EBusCollectionDTO.java
+++ b/src/main/java/de/csdev/ebus/cfg/std/dto/EBusCollectionDTO.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/cfg/std/dto/EBusCommandDTO.java b/src/main/java/de/csdev/ebus/cfg/std/dto/EBusCommandDTO.java
index 5fc5889..219b2f0 100644
--- a/src/main/java/de/csdev/ebus/cfg/std/dto/EBusCommandDTO.java
+++ b/src/main/java/de/csdev/ebus/cfg/std/dto/EBusCommandDTO.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/cfg/std/dto/EBusCommandMethodDTO.java b/src/main/java/de/csdev/ebus/cfg/std/dto/EBusCommandMethodDTO.java
index a4c7a8c..63912a1 100644
--- a/src/main/java/de/csdev/ebus/cfg/std/dto/EBusCommandMethodDTO.java
+++ b/src/main/java/de/csdev/ebus/cfg/std/dto/EBusCommandMethodDTO.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/cfg/std/dto/EBusCommandTemplatesDTO.java b/src/main/java/de/csdev/ebus/cfg/std/dto/EBusCommandTemplatesDTO.java
index 3c4681d..fbf3dc4 100644
--- a/src/main/java/de/csdev/ebus/cfg/std/dto/EBusCommandTemplatesDTO.java
+++ b/src/main/java/de/csdev/ebus/cfg/std/dto/EBusCommandTemplatesDTO.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/cfg/std/dto/EBusValueDTO.java b/src/main/java/de/csdev/ebus/cfg/std/dto/EBusValueDTO.java
index 259adcc..55e7433 100644
--- a/src/main/java/de/csdev/ebus/cfg/std/dto/EBusValueDTO.java
+++ b/src/main/java/de/csdev/ebus/cfg/std/dto/EBusValueDTO.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/client/EBusClient.java b/src/main/java/de/csdev/ebus/client/EBusClient.java
index 05f5f1a..18f2a7b 100644
--- a/src/main/java/de/csdev/ebus/client/EBusClient.java
+++ b/src/main/java/de/csdev/ebus/client/EBusClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
@@ -80,11 +80,7 @@ public EBusClient(final @NonNull EBusCommandRegistry commandRegistry) {
      */
     public void addEBusDeviceTableListener(final @NonNull IEBusDeviceTableListener listener) {
         Objects.requireNonNull(listener, LABEL_LISTENER);
-        if (deviceTable != null) {
-            deviceTable.addEBusDeviceTableListener(listener);
-        } else {
-            throw new IllegalStateException("Device Table is not initialized!");
-        }
+        deviceTable.addEBusDeviceTableListener(listener);
     }
 
     /**
@@ -110,11 +106,7 @@ public void addEBusEventListener(final @NonNull IEBusConnectorEventListener list
      */
     public void addEBusParserListener(final @NonNull IEBusParserListener listener) {
         Objects.requireNonNull(listener, LABEL_LISTENER);
-        if (resolverService != null) {
-            resolverService.addEBusParserListener(listener);
-        } else {
-            throw new IllegalStateException("Resolver Service is not initialized!");
-        }
+        resolverService.addEBusParserListener(listener);
     }
 
     /**
@@ -182,7 +174,7 @@ public void addEBusParserListener(final @NonNull IEBusParserListener listener) {
      */
     public void connect(final @NonNull IEBusController controller, final byte masterAddress) {
 
-        Objects.requireNonNull(controller, "Parameter controller can't be null!");
+        Objects.requireNonNull(controller, "controller");
 
         controller.addEBusEventListener(resolverService);
 
@@ -206,10 +198,12 @@ public void connect(final @NonNull IEBusController controller, final byte master
     public void dispose() {
         if (controller != null) {
             controller.interrupt();
+            controller = null;
         }
 
         if (deviceTableService != null) {
             deviceTableService.dispose();
+            deviceTableService = null;
         }
 
         if (deviceTable != null) {
diff --git a/src/main/java/de/csdev/ebus/command/EBusCommand.java b/src/main/java/de/csdev/ebus/command/EBusCommand.java
index 73c9b5c..c76a67a 100644
--- a/src/main/java/de/csdev/ebus/command/EBusCommand.java
+++ b/src/main/java/de/csdev/ebus/command/EBusCommand.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/EBusCommandCollection.java b/src/main/java/de/csdev/ebus/command/EBusCommandCollection.java
index 3cc8593..06ea76b 100644
--- a/src/main/java/de/csdev/ebus/command/EBusCommandCollection.java
+++ b/src/main/java/de/csdev/ebus/command/EBusCommandCollection.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/EBusCommandException.java b/src/main/java/de/csdev/ebus/command/EBusCommandException.java
index dea0723..4eeb8d0 100644
--- a/src/main/java/de/csdev/ebus/command/EBusCommandException.java
+++ b/src/main/java/de/csdev/ebus/command/EBusCommandException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/EBusCommandMethod.java b/src/main/java/de/csdev/ebus/command/EBusCommandMethod.java
index b18b2f5..c58daff 100644
--- a/src/main/java/de/csdev/ebus/command/EBusCommandMethod.java
+++ b/src/main/java/de/csdev/ebus/command/EBusCommandMethod.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/EBusCommandNestedValue.java b/src/main/java/de/csdev/ebus/command/EBusCommandNestedValue.java
index 16002ef..6f96b91 100644
--- a/src/main/java/de/csdev/ebus/command/EBusCommandNestedValue.java
+++ b/src/main/java/de/csdev/ebus/command/EBusCommandNestedValue.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/EBusCommandRegistry.java b/src/main/java/de/csdev/ebus/command/EBusCommandRegistry.java
index 5983b8a..c7e9b59 100644
--- a/src/main/java/de/csdev/ebus/command/EBusCommandRegistry.java
+++ b/src/main/java/de/csdev/ebus/command/EBusCommandRegistry.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/EBusCommandUtils.java b/src/main/java/de/csdev/ebus/command/EBusCommandUtils.java
index 02f9620..003803d 100644
--- a/src/main/java/de/csdev/ebus/command/EBusCommandUtils.java
+++ b/src/main/java/de/csdev/ebus/command/EBusCommandUtils.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/EBusCommandValue.java b/src/main/java/de/csdev/ebus/command/EBusCommandValue.java
index 683346f..7691646 100644
--- a/src/main/java/de/csdev/ebus/command/EBusCommandValue.java
+++ b/src/main/java/de/csdev/ebus/command/EBusCommandValue.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/IEBusCommand.java b/src/main/java/de/csdev/ebus/command/IEBusCommand.java
index b836d81..2eff688 100644
--- a/src/main/java/de/csdev/ebus/command/IEBusCommand.java
+++ b/src/main/java/de/csdev/ebus/command/IEBusCommand.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/IEBusCommandCollection.java b/src/main/java/de/csdev/ebus/command/IEBusCommandCollection.java
index aa9c8b4..cdb48c2 100644
--- a/src/main/java/de/csdev/ebus/command/IEBusCommandCollection.java
+++ b/src/main/java/de/csdev/ebus/command/IEBusCommandCollection.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/IEBusCommandMethod.java b/src/main/java/de/csdev/ebus/command/IEBusCommandMethod.java
index 516ccef..6c2ca11 100644
--- a/src/main/java/de/csdev/ebus/command/IEBusCommandMethod.java
+++ b/src/main/java/de/csdev/ebus/command/IEBusCommandMethod.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/IEBusNestedValue.java b/src/main/java/de/csdev/ebus/command/IEBusNestedValue.java
index b6e7692..50009fd 100644
--- a/src/main/java/de/csdev/ebus/command/IEBusNestedValue.java
+++ b/src/main/java/de/csdev/ebus/command/IEBusNestedValue.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/IEBusValue.java b/src/main/java/de/csdev/ebus/command/IEBusValue.java
index 9c9bcc1..6c450a9 100644
--- a/src/main/java/de/csdev/ebus/command/IEBusValue.java
+++ b/src/main/java/de/csdev/ebus/command/IEBusValue.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/EBusAbstractType.java b/src/main/java/de/csdev/ebus/command/datatypes/EBusAbstractType.java
index b4c87d5..aeb3a94 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/EBusAbstractType.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/EBusAbstractType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/EBusTypeException.java b/src/main/java/de/csdev/ebus/command/datatypes/EBusTypeException.java
index 8e090a6..38f719a 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/EBusTypeException.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/EBusTypeException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/EBusTypeRegistry.java b/src/main/java/de/csdev/ebus/command/datatypes/EBusTypeRegistry.java
index 4efc645..6b63e50 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/EBusTypeRegistry.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/EBusTypeRegistry.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/IEBusComplexType.java b/src/main/java/de/csdev/ebus/command/datatypes/IEBusComplexType.java
index e289932..fb7cedd 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/IEBusComplexType.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/IEBusComplexType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/IEBusType.java b/src/main/java/de/csdev/ebus/command/datatypes/IEBusType.java
index 105e78f..9aa51d7 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/IEBusType.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/IEBusType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeBytes.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeBytes.java
index 380e933..e2f73c6 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeBytes.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeBytes.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDate.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDate.java
index beb1552..090e3e1 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDate.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDate.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDateTime.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDateTime.java
index 8302dd2..3aeef47 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDateTime.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeDateTime.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeKWCrc.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeKWCrc.java
index c7c0083..b0480cd 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeKWCrc.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeKWCrc.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeMultiWord.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeMultiWord.java
index af94cf1..adb9007 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeMultiWord.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeMultiWord.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeString.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeString.java
index 61fe1a0..5fbaf9f 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeString.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeString.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeTime.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeTime.java
index df85167..1145f07 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeTime.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeTime.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeVersion.java b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeVersion.java
index cbd47f1..459c723 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeVersion.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/ext/EBusTypeVersion.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/AbstractEBusTypeNumber.java b/src/main/java/de/csdev/ebus/command/datatypes/std/AbstractEBusTypeNumber.java
index 0a77bb3..da6eff6 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/std/AbstractEBusTypeNumber.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/std/AbstractEBusTypeNumber.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/AbstractEBusTypeUnsignedNumber.java b/src/main/java/de/csdev/ebus/command/datatypes/std/AbstractEBusTypeUnsignedNumber.java
index 57c1071..89bcc12 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/std/AbstractEBusTypeUnsignedNumber.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/std/AbstractEBusTypeUnsignedNumber.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBCD.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBCD.java
index 1fbc336..f956d01 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBCD.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBCD.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBit.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBit.java
index 66e6ae9..6c7fa87 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBit.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeBit.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeByte.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeByte.java
index 97c6586..70bc0ad 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeByte.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeByte.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeChar.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeChar.java
index f10a112..b25ba53 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeChar.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeChar.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1b.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1b.java
index 1736836..c7ab667 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1b.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1b.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1c.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1c.java
index 855548b..b81a794 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1c.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData1c.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData2b.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData2b.java
index 0d1906c..2449a1d 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData2b.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData2b.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData2c.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData2c.java
index b2dd47b..2a9940b 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData2c.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeData2c.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeFloat.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeFloat.java
index cfebb99..7eb429b 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeFloat.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeFloat.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeInteger.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeInteger.java
index 3e4c866..d6cd2ed 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeInteger.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeInteger.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeNumber.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeNumber.java
index ce003bf..eeea5ca 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeNumber.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeNumber.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeUnsignedNumber.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeUnsignedNumber.java
index 68638bd..994e0c3 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeUnsignedNumber.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeUnsignedNumber.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeWord.java b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeWord.java
index b9e5b19..3dc2024 100644
--- a/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeWord.java
+++ b/src/main/java/de/csdev/ebus/command/datatypes/std/EBusTypeWord.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/EBusConnectorEventListener.java b/src/main/java/de/csdev/ebus/core/EBusConnectorEventListener.java
index 2719ed8..ddd3d32 100644
--- a/src/main/java/de/csdev/ebus/core/EBusConnectorEventListener.java
+++ b/src/main/java/de/csdev/ebus/core/EBusConnectorEventListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/EBusConsts.java b/src/main/java/de/csdev/ebus/core/EBusConsts.java
index d93f520..631b673 100644
--- a/src/main/java/de/csdev/ebus/core/EBusConsts.java
+++ b/src/main/java/de/csdev/ebus/core/EBusConsts.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/EBusControllerBase.java b/src/main/java/de/csdev/ebus/core/EBusControllerBase.java
index 7403ec2..2c37f16 100644
--- a/src/main/java/de/csdev/ebus/core/EBusControllerBase.java
+++ b/src/main/java/de/csdev/ebus/core/EBusControllerBase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
@@ -132,10 +132,12 @@ protected void fireOnConnectionException(final @NonNull Exception e) {
 
         threadPool.execute(() -> {
             for (IEBusConnectorEventListener listener : listeners) {
-                try {
-                    listener.onConnectionException(e);
-                } catch (Exception e1) {
-                    logger.error("Error while firing onConnectionException events!", e1);
+                if (!Thread.interrupted()) {
+                    try {
+                        listener.onConnectionException(e);
+                    } catch (Exception e1) {
+                        logger.error("Error while firing onConnectionException events!", e1);
+                    }
                 }
             }
         });
@@ -166,10 +168,12 @@ protected void fireOnEBusTelegramReceived(final byte @NonNull [] receivedData, f
 
         threadPool.execute(() -> {
             for (IEBusConnectorEventListener listener : listeners) {
-                try {
-                    listener.onTelegramReceived(receivedData, sendQueueId);
-                } catch (Exception e) {
-                    logger.error("Error while firing onTelegramReceived events!", e);
+                if (!Thread.interrupted()) {
+                    try {
+                        listener.onTelegramReceived(receivedData, sendQueueId);
+                    } catch (Exception e) {
+                        logger.error("Error while firing onTelegramReceived events!", e);
+                    }
                 }
             }
         });
@@ -194,10 +198,12 @@ protected void fireOnEBusDataException(final @NonNull EBusDataException exceptio
 
         threadPool.execute(() -> {
             for (IEBusConnectorEventListener listener : listeners) {
-                try {
-                    listener.onTelegramException(exception, sendQueueId);
-                } catch (Exception e) {
-                    logger.error("Error while firing onTelegramException events!", e);
+                if (!Thread.interrupted()) {
+                    try {
+                        listener.onTelegramException(exception, sendQueueId);
+                    } catch (Exception e) {
+                        logger.error("Error while firing onTelegramException events!", e);
+                    }
                 }
             }
         });
diff --git a/src/main/java/de/csdev/ebus/core/EBusControllerException.java b/src/main/java/de/csdev/ebus/core/EBusControllerException.java
index faa1a2b..95ab9ba 100644
--- a/src/main/java/de/csdev/ebus/core/EBusControllerException.java
+++ b/src/main/java/de/csdev/ebus/core/EBusControllerException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/EBusDataException.java b/src/main/java/de/csdev/ebus/core/EBusDataException.java
index 4366e5d..e9a55c0 100644
--- a/src/main/java/de/csdev/ebus/core/EBusDataException.java
+++ b/src/main/java/de/csdev/ebus/core/EBusDataException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/EBusEbusdController.java b/src/main/java/de/csdev/ebus/core/EBusEbusdController.java
index 55d69dd..8015289 100644
--- a/src/main/java/de/csdev/ebus/core/EBusEbusdController.java
+++ b/src/main/java/de/csdev/ebus/core/EBusEbusdController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/EBusLowLevelController.java b/src/main/java/de/csdev/ebus/core/EBusLowLevelController.java
index b40c3fb..0b5f7c1 100644
--- a/src/main/java/de/csdev/ebus/core/EBusLowLevelController.java
+++ b/src/main/java/de/csdev/ebus/core/EBusLowLevelController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
@@ -185,7 +185,7 @@ public void run() {
         resetWatchdogTimer();
 
         // loop until interrupt or reconnector count is -1 (to many retries)
-        while (!(this.isInterrupted() || reConnectCounter == -1)) {
+        while (!(Thread.interrupted() || reConnectCounter == -1)) {
             try {
 
                 if (!connection.isOpen()) {
@@ -216,6 +216,7 @@ public void run() {
                 }
 
             } catch (InterruptedIOException | InterruptedException e) {
+                // bubble interrrupt flag to outer main loop
                 Thread.currentThread().interrupt();
 
             } catch (IOException e) {
@@ -227,6 +228,7 @@ public void run() {
                 } catch (IOException e1) {
                     logger.error(e.toString(), e1);
                 } catch (InterruptedException e1) {
+                    // bubble interrrupt flag to outer main loop
                     Thread.currentThread().interrupt();
                 }
 
@@ -241,6 +243,8 @@ public void run() {
             }
         } // while loop
 
+        // interrupted flag is not active anymore
+
         try {
             dispose();
         } catch (InterruptedException e) {
diff --git a/src/main/java/de/csdev/ebus/core/EBusQueue.java b/src/main/java/de/csdev/ebus/core/EBusQueue.java
index 1c85556..506ee8d 100644
--- a/src/main/java/de/csdev/ebus/core/EBusQueue.java
+++ b/src/main/java/de/csdev/ebus/core/EBusQueue.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/EBusReceiveStateMachine.java b/src/main/java/de/csdev/ebus/core/EBusReceiveStateMachine.java
index 49847b1..9800638 100644
--- a/src/main/java/de/csdev/ebus/core/EBusReceiveStateMachine.java
+++ b/src/main/java/de/csdev/ebus/core/EBusReceiveStateMachine.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/EBusVersion.java b/src/main/java/de/csdev/ebus/core/EBusVersion.java
index 07799c7..949777d 100644
--- a/src/main/java/de/csdev/ebus/core/EBusVersion.java
+++ b/src/main/java/de/csdev/ebus/core/EBusVersion.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/EBusWorkerThreadFactory.java b/src/main/java/de/csdev/ebus/core/EBusWorkerThreadFactory.java
index bd60f46..7dd647e 100644
--- a/src/main/java/de/csdev/ebus/core/EBusWorkerThreadFactory.java
+++ b/src/main/java/de/csdev/ebus/core/EBusWorkerThreadFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/IEBusConnectorEventListener.java b/src/main/java/de/csdev/ebus/core/IEBusConnectorEventListener.java
index 279cea8..7b1e574 100644
--- a/src/main/java/de/csdev/ebus/core/IEBusConnectorEventListener.java
+++ b/src/main/java/de/csdev/ebus/core/IEBusConnectorEventListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/IEBusController.java b/src/main/java/de/csdev/ebus/core/IEBusController.java
index cd7c3c7..3db4dfe 100644
--- a/src/main/java/de/csdev/ebus/core/IEBusController.java
+++ b/src/main/java/de/csdev/ebus/core/IEBusController.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/connection/AbstractEBusConnection.java b/src/main/java/de/csdev/ebus/core/connection/AbstractEBusConnection.java
index 3ef60e7..27f9608 100644
--- a/src/main/java/de/csdev/ebus/core/connection/AbstractEBusConnection.java
+++ b/src/main/java/de/csdev/ebus/core/connection/AbstractEBusConnection.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/connection/EBusCaptureProxyConnection.java b/src/main/java/de/csdev/ebus/core/connection/EBusCaptureProxyConnection.java
index 9b64249..0350fb2 100644
--- a/src/main/java/de/csdev/ebus/core/connection/EBusCaptureProxyConnection.java
+++ b/src/main/java/de/csdev/ebus/core/connection/EBusCaptureProxyConnection.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/connection/EBusEmulatorConnection.java b/src/main/java/de/csdev/ebus/core/connection/EBusEmulatorConnection.java
index 23d6fff..3018ce9 100644
--- a/src/main/java/de/csdev/ebus/core/connection/EBusEmulatorConnection.java
+++ b/src/main/java/de/csdev/ebus/core/connection/EBusEmulatorConnection.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/connection/EBusJSerialCommConnection.java b/src/main/java/de/csdev/ebus/core/connection/EBusJSerialCommConnection.java
index 6e6499e..23e6d9b 100644
--- a/src/main/java/de/csdev/ebus/core/connection/EBusJSerialCommConnection.java
+++ b/src/main/java/de/csdev/ebus/core/connection/EBusJSerialCommConnection.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/connection/EBusSerialNRJavaSerialConnection.java b/src/main/java/de/csdev/ebus/core/connection/EBusSerialNRJavaSerialConnection.java
index 7089c35..7141647 100644
--- a/src/main/java/de/csdev/ebus/core/connection/EBusSerialNRJavaSerialConnection.java
+++ b/src/main/java/de/csdev/ebus/core/connection/EBusSerialNRJavaSerialConnection.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/connection/EBusTCPConnection.java b/src/main/java/de/csdev/ebus/core/connection/EBusTCPConnection.java
index 496fc5e..2d98b1a 100644
--- a/src/main/java/de/csdev/ebus/core/connection/EBusTCPConnection.java
+++ b/src/main/java/de/csdev/ebus/core/connection/EBusTCPConnection.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/core/connection/IEBusConnection.java b/src/main/java/de/csdev/ebus/core/connection/IEBusConnection.java
index fd98b2d..6634b7f 100644
--- a/src/main/java/de/csdev/ebus/core/connection/IEBusConnection.java
+++ b/src/main/java/de/csdev/ebus/core/connection/IEBusConnection.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/service/device/EBusDevice.java b/src/main/java/de/csdev/ebus/service/device/EBusDevice.java
index d8e0b47..b9df9a9 100644
--- a/src/main/java/de/csdev/ebus/service/device/EBusDevice.java
+++ b/src/main/java/de/csdev/ebus/service/device/EBusDevice.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/service/device/EBusDeviceTable.java b/src/main/java/de/csdev/ebus/service/device/EBusDeviceTable.java
index 5d88051..f31e4a0 100644
--- a/src/main/java/de/csdev/ebus/service/device/EBusDeviceTable.java
+++ b/src/main/java/de/csdev/ebus/service/device/EBusDeviceTable.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/service/device/EBusDeviceTableService.java b/src/main/java/de/csdev/ebus/service/device/EBusDeviceTableService.java
index 7fd0ac1..091be75 100644
--- a/src/main/java/de/csdev/ebus/service/device/EBusDeviceTableService.java
+++ b/src/main/java/de/csdev/ebus/service/device/EBusDeviceTableService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
@@ -10,8 +10,10 @@
 
 import java.nio.ByteBuffer;
 import java.util.Map;
+import java.util.Objects;
 
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,18 +36,19 @@
  * @author Christian Sowada - Initial contribution
  *
  */
+@NonNullByDefault
 public class EBusDeviceTableService extends EBusConnectorEventListener
         implements IEBusParserListener, IEBusDeviceTableListener {
 
     private static final Logger logger = LoggerFactory.getLogger(EBusDeviceTableService.class);
 
-    private IEBusController controller;
+    private @NonNull IEBusController controller;
 
-    private Integer scanQueueId = -1;
+    private @NonNull Integer scanQueueId = -1;
 
-    private EBusCommandRegistry configurationProvider;
+    private @NonNull EBusCommandRegistry configurationProvider;
 
-    private EBusDeviceTable deviceTable;
+    private @NonNull EBusDeviceTable deviceTable;
 
     private boolean disableIdentificationRequests = false;
 
@@ -53,8 +56,12 @@ public class EBusDeviceTableService extends EBusConnectorEventListener
 
     private boolean scanRunning = false;
 
-    public EBusDeviceTableService(IEBusController controller, EBusCommandRegistry configurationProvider,
-            EBusDeviceTable deviceTable) {
+    public EBusDeviceTableService(@NonNull IEBusController controller,
+            @NonNull EBusCommandRegistry configurationProvider, @NonNull EBusDeviceTable deviceTable) {
+
+        Objects.requireNonNull(controller);
+        Objects.requireNonNull(configurationProvider);
+        Objects.requireNonNull(deviceTable);
 
         this.controller = controller;
         this.configurationProvider = configurationProvider;
@@ -174,7 +181,7 @@ private synchronized boolean scanDevice2(boolean nextDevice) {
         return false;
     }
 
-    private Byte nextSlaveAddress(byte slaveAddress) {
+    private @Nullable Byte nextSlaveAddress(byte slaveAddress) {
 
         if (slaveAddress == (byte) 0xFD) {
             return null;
@@ -192,7 +199,6 @@ private Byte nextSlaveAddress(byte slaveAddress) {
      */
     public void dispose() {
         this.controller.removeEBusEventListener(this);
-        this.controller = null;
     }
 
     /**
@@ -253,7 +259,8 @@ public void sendIdentificationRequest(byte slaveAddress) {
     /*
      * (non-Javadoc)
      *
-     * @see de.csdev.ebus.core.EBusConnectorEventListener#onTelegramReceived(byte[], java.lang.Integer)
+     * @see de.csdev.ebus.core.EBusConnectorEventListener#onTelegramReceived(byte[],
+     * java.lang.Integer)
      */
     @Override
     public void onTelegramReceived(byte @NonNull [] receivedData, @Nullable Integer sendQueueId) {
@@ -281,8 +288,9 @@ public void onTelegramReceived(byte @NonNull [] receivedData, @Nullable Integer
     /*
      * (non-Javadoc)
      *
-     * @see de.csdev.ebus.core.EBusConnectorEventListener#onTelegramException(de.csdev.ebus.core.EBusDataException,
-     * java.lang.Integer)
+     * @see
+     * de.csdev.ebus.core.EBusConnectorEventListener#onTelegramException(de.csdev.
+     * ebus.core.EBusDataException, java.lang.Integer)
      */
     @Override
     public void onTelegramException(@NonNull EBusDataException exception, @Nullable Integer sendQueueId) {
@@ -304,8 +312,9 @@ public void onTelegramException(@NonNull EBusDataException exception, @Nullable
     /*
      * (non-Javadoc)
      *
-     * @see de.csdev.ebus.service.parser.EBusParserListener#onTelegramResolved(de.csdev.ebus.command.IEBusCommand,
-     * java.util.Map, byte[], java.lang.Integer)
+     * @see
+     * de.csdev.ebus.service.parser.EBusParserListener#onTelegramResolved(de.csdev.
+     * ebus.command.IEBusCommand, java.util.Map, byte[], java.lang.Integer)
      */
     @Override
     public void onTelegramResolved(@NonNull IEBusCommandMethod commandChannel,
@@ -329,8 +338,10 @@ public void onTelegramResolved(@NonNull IEBusCommandMethod commandChannel,
     /*
      * (non-Javadoc)
      *
-     * @see de.csdev.ebus.service.device.EBusDeviceTableListener#onEBusDeviceUpdate(de.csdev.ebus.service.device.
-     * EBusDeviceTableListener.TYPE, de.csdev.ebus.service.device.IEBusDevice)
+     * @see
+     * de.csdev.ebus.service.device.EBusDeviceTableListener#onEBusDeviceUpdate(de.
+     * csdev.ebus.service.device. EBusDeviceTableListener.TYPE,
+     * de.csdev.ebus.service.device.IEBusDevice)
      */
     @Override
     public void onEBusDeviceUpdate(IEBusDeviceTableListener.@NonNull TYPE type, @NonNull IEBusDevice device) {
diff --git a/src/main/java/de/csdev/ebus/service/device/IEBusDevice.java b/src/main/java/de/csdev/ebus/service/device/IEBusDevice.java
index 23bcbdc..247ec9a 100644
--- a/src/main/java/de/csdev/ebus/service/device/IEBusDevice.java
+++ b/src/main/java/de/csdev/ebus/service/device/IEBusDevice.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/service/device/IEBusDeviceTableListener.java b/src/main/java/de/csdev/ebus/service/device/IEBusDeviceTableListener.java
index f5d301c..2072e57 100644
--- a/src/main/java/de/csdev/ebus/service/device/IEBusDeviceTableListener.java
+++ b/src/main/java/de/csdev/ebus/service/device/IEBusDeviceTableListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/service/metrics/EBusMetricsService.java b/src/main/java/de/csdev/ebus/service/metrics/EBusMetricsService.java
index 237da7c..b55fa71 100644
--- a/src/main/java/de/csdev/ebus/service/metrics/EBusMetricsService.java
+++ b/src/main/java/de/csdev/ebus/service/metrics/EBusMetricsService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/service/parser/EBusParserService.java b/src/main/java/de/csdev/ebus/service/parser/EBusParserService.java
index cd3584d..b1b0d32 100644
--- a/src/main/java/de/csdev/ebus/service/parser/EBusParserService.java
+++ b/src/main/java/de/csdev/ebus/service/parser/EBusParserService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/service/parser/IEBusParserListener.java b/src/main/java/de/csdev/ebus/service/parser/IEBusParserListener.java
index 922b9d0..d78584c 100644
--- a/src/main/java/de/csdev/ebus/service/parser/IEBusParserListener.java
+++ b/src/main/java/de/csdev/ebus/service/parser/IEBusParserListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/utils/CollectionUtils.java b/src/main/java/de/csdev/ebus/utils/CollectionUtils.java
index 53ff1aa..9381856 100644
--- a/src/main/java/de/csdev/ebus/utils/CollectionUtils.java
+++ b/src/main/java/de/csdev/ebus/utils/CollectionUtils.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/utils/EBusConsoleUtils.java b/src/main/java/de/csdev/ebus/utils/EBusConsoleUtils.java
index 675534b..02bd258 100644
--- a/src/main/java/de/csdev/ebus/utils/EBusConsoleUtils.java
+++ b/src/main/java/de/csdev/ebus/utils/EBusConsoleUtils.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/utils/EBusDateTime.java b/src/main/java/de/csdev/ebus/utils/EBusDateTime.java
index c999e41..1d0dd85 100644
--- a/src/main/java/de/csdev/ebus/utils/EBusDateTime.java
+++ b/src/main/java/de/csdev/ebus/utils/EBusDateTime.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/utils/EBusTelegramWriter.java b/src/main/java/de/csdev/ebus/utils/EBusTelegramWriter.java
index b609943..1154a5b 100644
--- a/src/main/java/de/csdev/ebus/utils/EBusTelegramWriter.java
+++ b/src/main/java/de/csdev/ebus/utils/EBusTelegramWriter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/utils/EBusUtils.java b/src/main/java/de/csdev/ebus/utils/EBusUtils.java
index 1bd2886..e1ee115 100644
--- a/src/main/java/de/csdev/ebus/utils/EBusUtils.java
+++ b/src/main/java/de/csdev/ebus/utils/EBusUtils.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/utils/Emulator.java b/src/main/java/de/csdev/ebus/utils/Emulator.java
index 42bd7a5..18beb4f 100644
--- a/src/main/java/de/csdev/ebus/utils/Emulator.java
+++ b/src/main/java/de/csdev/ebus/utils/Emulator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/utils/EmulatorCapture.java b/src/main/java/de/csdev/ebus/utils/EmulatorCapture.java
index fd99115..033747b 100644
--- a/src/main/java/de/csdev/ebus/utils/EmulatorCapture.java
+++ b/src/main/java/de/csdev/ebus/utils/EmulatorCapture.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/main/java/de/csdev/ebus/utils/NumberUtils.java b/src/main/java/de/csdev/ebus/utils/NumberUtils.java
index dc53b28..c1dc3a2 100644
--- a/src/main/java/de/csdev/ebus/utils/NumberUtils.java
+++ b/src/main/java/de/csdev/ebus/utils/NumberUtils.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/StaticTestTelegrams.java b/src/test/java/de/csdev/ebus/StaticTestTelegrams.java
index a92b1a1..85f652c 100644
--- a/src/test/java/de/csdev/ebus/StaticTestTelegrams.java
+++ b/src/test/java/de/csdev/ebus/StaticTestTelegrams.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/TestUtils.java b/src/test/java/de/csdev/ebus/TestUtils.java
index 3c9b29d..eee535d 100644
--- a/src/test/java/de/csdev/ebus/TestUtils.java
+++ b/src/test/java/de/csdev/ebus/TestUtils.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/basic/EBusUtilsTest.java b/src/test/java/de/csdev/ebus/basic/EBusUtilsTest.java
index a8a9201..c3f32c1 100644
--- a/src/test/java/de/csdev/ebus/basic/EBusUtilsTest.java
+++ b/src/test/java/de/csdev/ebus/basic/EBusUtilsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/cfg/BuildTelegramTest.java b/src/test/java/de/csdev/ebus/cfg/BuildTelegramTest.java
index 8c334ce..fded3c6 100644
--- a/src/test/java/de/csdev/ebus/cfg/BuildTelegramTest.java
+++ b/src/test/java/de/csdev/ebus/cfg/BuildTelegramTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/cfg/EBusBitTypeTest.java b/src/test/java/de/csdev/ebus/cfg/EBusBitTypeTest.java
index b19b27a..716814d 100644
--- a/src/test/java/de/csdev/ebus/cfg/EBusBitTypeTest.java
+++ b/src/test/java/de/csdev/ebus/cfg/EBusBitTypeTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/cfg/EBusCommonTelegramTest.java b/src/test/java/de/csdev/ebus/cfg/EBusCommonTelegramTest.java
index 5f0184e..77a039c 100644
--- a/src/test/java/de/csdev/ebus/cfg/EBusCommonTelegramTest.java
+++ b/src/test/java/de/csdev/ebus/cfg/EBusCommonTelegramTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/cfg/EBusConfigurationBundleTest.java b/src/test/java/de/csdev/ebus/cfg/EBusConfigurationBundleTest.java
index fc4069b..cf0471c 100644
--- a/src/test/java/de/csdev/ebus/cfg/EBusConfigurationBundleTest.java
+++ b/src/test/java/de/csdev/ebus/cfg/EBusConfigurationBundleTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/cfg/EBusConfigurationHash.java b/src/test/java/de/csdev/ebus/cfg/EBusConfigurationHash.java
index 882da0a..47d5403 100644
--- a/src/test/java/de/csdev/ebus/cfg/EBusConfigurationHash.java
+++ b/src/test/java/de/csdev/ebus/cfg/EBusConfigurationHash.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/cfg/EBusConfigurationTest.java b/src/test/java/de/csdev/ebus/cfg/EBusConfigurationTest.java
index b7dfc4c..3199428 100644
--- a/src/test/java/de/csdev/ebus/cfg/EBusConfigurationTest.java
+++ b/src/test/java/de/csdev/ebus/cfg/EBusConfigurationTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/cfg/EBusConsoleTest.java b/src/test/java/de/csdev/ebus/cfg/EBusConsoleTest.java
index 4257c4b..1194a3e 100644
--- a/src/test/java/de/csdev/ebus/cfg/EBusConsoleTest.java
+++ b/src/test/java/de/csdev/ebus/cfg/EBusConsoleTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/cfg/EBusNestedTemplatesTest.java b/src/test/java/de/csdev/ebus/cfg/EBusNestedTemplatesTest.java
index 012c9ea..e6307f8 100644
--- a/src/test/java/de/csdev/ebus/cfg/EBusNestedTemplatesTest.java
+++ b/src/test/java/de/csdev/ebus/cfg/EBusNestedTemplatesTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/ReplaceValueTest.java b/src/test/java/de/csdev/ebus/command/datatype/ReplaceValueTest.java
index a1a4f1d..f92586d 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/ReplaceValueTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/ReplaceValueTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/ext/CrcKWTest.java b/src/test/java/de/csdev/ebus/command/datatype/ext/CrcKWTest.java
index 69b53ba..3310697 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/ext/CrcKWTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/ext/CrcKWTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/ext/DateTest.java b/src/test/java/de/csdev/ebus/command/datatype/ext/DateTest.java
index 65eb2ba..7a55390 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/ext/DateTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/ext/DateTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/ext/DateTimeTest.java b/src/test/java/de/csdev/ebus/command/datatype/ext/DateTimeTest.java
index d822f86..6e9d26c 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/ext/DateTimeTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/ext/DateTimeTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/ext/FloatTest.java b/src/test/java/de/csdev/ebus/command/datatype/ext/FloatTest.java
index 05e877a..c91379d 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/ext/FloatTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/ext/FloatTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/ext/MultiWordTest.java b/src/test/java/de/csdev/ebus/command/datatype/ext/MultiWordTest.java
index 0af5c23..e5157f8 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/ext/MultiWordTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/ext/MultiWordTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/ext/StringTest.java b/src/test/java/de/csdev/ebus/command/datatype/ext/StringTest.java
index 43b2973..b8d9e44 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/ext/StringTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/ext/StringTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/ext/TimeTest.java b/src/test/java/de/csdev/ebus/command/datatype/ext/TimeTest.java
index 5f031a2..71635e7 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/ext/TimeTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/ext/TimeTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/ext/VersionTest.java b/src/test/java/de/csdev/ebus/command/datatype/ext/VersionTest.java
index 1a806cf..01bf38a 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/ext/VersionTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/ext/VersionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/std/BCDTest.java b/src/test/java/de/csdev/ebus/command/datatype/std/BCDTest.java
index 10c6669..ca0b2a4 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/std/BCDTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/std/BCDTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/std/BitTest.java b/src/test/java/de/csdev/ebus/command/datatype/std/BitTest.java
index 9ef1e09..3fa9011 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/std/BitTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/std/BitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/std/ByteTest.java b/src/test/java/de/csdev/ebus/command/datatype/std/ByteTest.java
index 8140cee..059065d 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/std/ByteTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/std/ByteTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/std/CharTest.java b/src/test/java/de/csdev/ebus/command/datatype/std/CharTest.java
index c89df7c..667e474 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/std/CharTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/std/CharTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/std/Data1bTest.java b/src/test/java/de/csdev/ebus/command/datatype/std/Data1bTest.java
index cfd944c..7769680 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/std/Data1bTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/std/Data1bTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/std/Data1cTest.java b/src/test/java/de/csdev/ebus/command/datatype/std/Data1cTest.java
index e5faaa7..181f82f 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/std/Data1cTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/std/Data1cTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/std/Data2bTest.java b/src/test/java/de/csdev/ebus/command/datatype/std/Data2bTest.java
index 7c46b6e..d6a2084 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/std/Data2bTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/std/Data2bTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/std/Data2cTest.java b/src/test/java/de/csdev/ebus/command/datatype/std/Data2cTest.java
index 46940da..33098cb 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/std/Data2cTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/std/Data2cTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/std/IntegerTest.java b/src/test/java/de/csdev/ebus/command/datatype/std/IntegerTest.java
index 6605c63..26d5ef2 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/std/IntegerTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/std/IntegerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/std/UCharTest.java b/src/test/java/de/csdev/ebus/command/datatype/std/UCharTest.java
index 98c3d8e..e8045dc 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/std/UCharTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/std/UCharTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/command/datatype/std/WordTest.java b/src/test/java/de/csdev/ebus/command/datatype/std/WordTest.java
index 6c8d4cb..d8b25f7 100644
--- a/src/test/java/de/csdev/ebus/command/datatype/std/WordTest.java
+++ b/src/test/java/de/csdev/ebus/command/datatype/std/WordTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/core/EBusControllerTest.java b/src/test/java/de/csdev/ebus/core/EBusControllerTest.java
index b4bbcf1..352fb38 100644
--- a/src/test/java/de/csdev/ebus/core/EBusControllerTest.java
+++ b/src/test/java/de/csdev/ebus/core/EBusControllerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/core/EBusStateMachineTest.java b/src/test/java/de/csdev/ebus/core/EBusStateMachineTest.java
index 20405d9..2e0475e 100644
--- a/src/test/java/de/csdev/ebus/core/EBusStateMachineTest.java
+++ b/src/test/java/de/csdev/ebus/core/EBusStateMachineTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/core/EBusVersionTest.java b/src/test/java/de/csdev/ebus/core/EBusVersionTest.java
index 2d24089..ddcb244 100644
--- a/src/test/java/de/csdev/ebus/core/EBusVersionTest.java
+++ b/src/test/java/de/csdev/ebus/core/EBusVersionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/service/device/DeviceTableTests.java b/src/test/java/de/csdev/ebus/service/device/DeviceTableTests.java
index 8f56839..f192082 100644
--- a/src/test/java/de/csdev/ebus/service/device/DeviceTableTests.java
+++ b/src/test/java/de/csdev/ebus/service/device/DeviceTableTests.java
@@ -1,6 +1,5 @@
-
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/service/metrics/MetricsTest.java b/src/test/java/de/csdev/ebus/service/metrics/MetricsTest.java
index 8f1dc0a..5665605 100644
--- a/src/test/java/de/csdev/ebus/service/metrics/MetricsTest.java
+++ b/src/test/java/de/csdev/ebus/service/metrics/MetricsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/wip/ClientTest.java b/src/test/java/de/csdev/ebus/wip/ClientTest.java
index ce31fcd..6f7dba2 100644
--- a/src/test/java/de/csdev/ebus/wip/ClientTest.java
+++ b/src/test/java/de/csdev/ebus/wip/ClientTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/wip/ClientTest2.java b/src/test/java/de/csdev/ebus/wip/ClientTest2.java
index 7ceccd5..08f29ab 100644
--- a/src/test/java/de/csdev/ebus/wip/ClientTest2.java
+++ b/src/test/java/de/csdev/ebus/wip/ClientTest2.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/wip/ClientTest3.java b/src/test/java/de/csdev/ebus/wip/ClientTest3.java
index 7cb2828..b42a567 100644
--- a/src/test/java/de/csdev/ebus/wip/ClientTest3.java
+++ b/src/test/java/de/csdev/ebus/wip/ClientTest3.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/wip/ConfigurationReaderTest.java b/src/test/java/de/csdev/ebus/wip/ConfigurationReaderTest.java
index abdb87f..f740b3e 100644
--- a/src/test/java/de/csdev/ebus/wip/ConfigurationReaderTest.java
+++ b/src/test/java/de/csdev/ebus/wip/ConfigurationReaderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/wip/EBusConfigurationTemplateTest.java b/src/test/java/de/csdev/ebus/wip/EBusConfigurationTemplateTest.java
index 1bb2ad4..a5ba737 100644
--- a/src/test/java/de/csdev/ebus/wip/EBusConfigurationTemplateTest.java
+++ b/src/test/java/de/csdev/ebus/wip/EBusConfigurationTemplateTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/wip/EBusCustomParserTest.java b/src/test/java/de/csdev/ebus/wip/EBusCustomParserTest.java
index 2c1b34a..c5d3178 100644
--- a/src/test/java/de/csdev/ebus/wip/EBusCustomParserTest.java
+++ b/src/test/java/de/csdev/ebus/wip/EBusCustomParserTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/wip/EBusVaillantBAI00TelegramTest.java b/src/test/java/de/csdev/ebus/wip/EBusVaillantBAI00TelegramTest.java
index d64e243..7a27d0a 100644
--- a/src/test/java/de/csdev/ebus/wip/EBusVaillantBAI00TelegramTest.java
+++ b/src/test/java/de/csdev/ebus/wip/EBusVaillantBAI00TelegramTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/wip/EBusWolfSM1TelegramTest2XXX.java b/src/test/java/de/csdev/ebus/wip/EBusWolfSM1TelegramTest2XXX.java
index ffdcf36..c72e6e2 100644
--- a/src/test/java/de/csdev/ebus/wip/EBusWolfSM1TelegramTest2XXX.java
+++ b/src/test/java/de/csdev/ebus/wip/EBusWolfSM1TelegramTest2XXX.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/wip/EBusdControllerTest.java b/src/test/java/de/csdev/ebus/wip/EBusdControllerTest.java
index fd1acb3..95c6f3d 100644
--- a/src/test/java/de/csdev/ebus/wip/EBusdControllerTest.java
+++ b/src/test/java/de/csdev/ebus/wip/EBusdControllerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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
diff --git a/src/test/java/de/csdev/ebus/wip/EmulatorTest.java b/src/test/java/de/csdev/ebus/wip/EmulatorTest.java
index de89578..8acafbd 100644
--- a/src/test/java/de/csdev/ebus/wip/EmulatorTest.java
+++ b/src/test/java/de/csdev/ebus/wip/EmulatorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2017-2021 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