Merge tag 'release/0.3.1'

[maven-release-plugin] copy for tag release/0.3.1
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index dc28a47..d4e1a5b 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,4 +1,18 @@
 ==============================================================
+Apache PLC4X (incubating) 0.3.1
+==============================================================
+
+This is a bugfix-release, that fixes some problems with S7 driver.
+
+Bug Fixes
+---------
+- The S7 driver didn't correctly handle "fill-bytes" in multi-item read-responses and multi-item write-requests
+- PLC4X-83: fixed NPE when reading odd-length array of one-byte base types
+- PLC4X-82: renamed flags "F" to Siemens Standard "M" (Marker)
+- PLC4X-84: Fixed a bug in the DefaultS7MessageProcessor which didn't correctly merge together split up items
+
+
+==============================================================
 Apache PLC4X (incubating) 0.3.0
 ==============================================================
 
diff --git a/examples/dummy-driver/pom.xml b/examples/dummy-driver/pom.xml
index 3bae60a..a22e2ad 100644
--- a/examples/dummy-driver/pom.xml
+++ b/examples/dummy-driver/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>dummy-driver</artifactId>
@@ -38,17 +38,17 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
diff --git a/examples/hello-cloud-azure/pom.xml b/examples/hello-cloud-azure/pom.xml
index 219d66b..a54dd46 100644
--- a/examples/hello-cloud-azure/pom.xml
+++ b/examples/hello-cloud-azure/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>examples</artifactId>
     <groupId>org.apache.plc4x.examples</groupId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>hello-cloud-azure</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
diff --git a/examples/hello-cloud-google/pom.xml b/examples/hello-cloud-google/pom.xml
index 8b97bad..708e5ab 100644
--- a/examples/hello-cloud-google/pom.xml
+++ b/examples/hello-cloud-google/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>examples</artifactId>
     <groupId>org.apache.plc4x.examples</groupId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>hello-cloud-google</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
diff --git a/examples/hello-connectivity-kafka/pom.xml b/examples/hello-connectivity-kafka/pom.xml
index ad30ac1..3e22a79 100644
--- a/examples/hello-connectivity-kafka/pom.xml
+++ b/examples/hello-connectivity-kafka/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>hello-connectivity-kafka</artifactId>
@@ -39,12 +39,12 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>apache-edgent</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
@@ -99,13 +99,13 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
diff --git a/examples/hello-integration-edgent/pom.xml b/examples/hello-integration-edgent/pom.xml
index 4bdb2b8..4199fa8 100644
--- a/examples/hello-integration-edgent/pom.xml
+++ b/examples/hello-integration-edgent/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>hellp-integration-edgent</artifactId>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>apache-edgent</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
diff --git a/examples/hello-opm/pom.xml b/examples/hello-opm/pom.xml
index 95a9276..23164f4 100644
--- a/examples/hello-opm/pom.xml
+++ b/examples/hello-opm/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>hello-opm</artifactId>
@@ -39,25 +39,25 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-opm</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-connection-pool</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <!-- Required driver implementation -->
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>runtime</scope>
     </dependency>
 
diff --git a/examples/hello-storage-elasticsearch/pom.xml b/examples/hello-storage-elasticsearch/pom.xml
index f4f039e..f1d3aaa 100644
--- a/examples/hello-storage-elasticsearch/pom.xml
+++ b/examples/hello-storage-elasticsearch/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>hello-elasticsearch</artifactId>
@@ -39,12 +39,12 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>apache-edgent</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>runtime</scope>
     </dependency>
 
diff --git a/examples/hello-world-plc4x/pom.xml b/examples/hello-world-plc4x/pom.xml
index 0cd502e..f62947a 100644
--- a/examples/hello-world-plc4x/pom.xml
+++ b/examples/hello-world-plc4x/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>hello-world-plc4x</artifactId>
@@ -39,20 +39,20 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <!-- Required driver implementation -->
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>runtime</scope>
     </dependency>
 
diff --git a/examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java b/examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
index 46a0832..9a236ae 100644
--- a/examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
+++ b/examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
@@ -78,7 +78,7 @@
             CompletableFuture<? extends PlcReadResponse> asyncResponse = readRequest.execute();
             asyncResponse.whenComplete((readResponse, throwable) -> {
                 if (readResponse != null) {
-                    printResponse(syncResponse);
+                    printResponse(readResponse);
                 } else {
                     logger.error("An error occurred: " + throwable.getMessage(), throwable);
                 }
diff --git a/examples/pom.xml b/examples/pom.xml
index b14e3fe..3bde994 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4x-parent</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <groupId>org.apache.plc4x.examples</groupId>
diff --git a/integrations/apache-brooklyn/pom.xml b/integrations/apache-brooklyn/pom.xml
index 7f5053c..abf605f 100644
--- a/integrations/apache-brooklyn/pom.xml
+++ b/integrations/apache-brooklyn/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>integrations</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>apache-brooklyn</artifactId>
diff --git a/integrations/apache-calcite/pom.xml b/integrations/apache-calcite/pom.xml
index 678eb5a..b7c6bcf 100644
--- a/integrations/apache-calcite/pom.xml
+++ b/integrations/apache-calcite/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>integrations</artifactId>
     <groupId>org.apache.plc4x</groupId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -52,19 +52,19 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-scraper</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <!--<scope>test</scope>-->
     </dependency>
   </dependencies>
diff --git a/integrations/apache-camel/pom.xml b/integrations/apache-camel/pom.xml
index edc2c55..9100a4c 100644
--- a/integrations/apache-camel/pom.xml
+++ b/integrations/apache-camel/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>integrations</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>apache-camel</artifactId>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
@@ -83,13 +83,13 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/integrations/apache-edgent/pom.xml b/integrations/apache-edgent/pom.xml
index 8a11200..290e9e3 100644
--- a/integrations/apache-edgent/pom.xml
+++ b/integrations/apache-edgent/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>integrations</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>apache-edgent</artifactId>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -67,13 +67,13 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/integrations/apache-kafka/pom.xml b/integrations/apache-kafka/pom.xml
index db2af08..d29af18 100644
--- a/integrations/apache-kafka/pom.xml
+++ b/integrations/apache-kafka/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>integrations</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>apache-kafka</artifactId>
diff --git a/integrations/apache-karaf/karaf-ads-feature/pom.xml b/integrations/apache-karaf/karaf-ads-feature/pom.xml
index 1ca7e0c..08c3f87 100644
--- a/integrations/apache-karaf/karaf-ads-feature/pom.xml
+++ b/integrations/apache-karaf/karaf-ads-feature/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>apache-karaf</artifactId>
     <groupId>org.apache.plc4x</groupId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>karaf-ads-feature</artifactId>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
   </dependencies>
 
diff --git a/integrations/apache-karaf/karaf-demo-server/pom.xml b/integrations/apache-karaf/karaf-demo-server/pom.xml
index 55f229b..544048b 100644
--- a/integrations/apache-karaf/karaf-demo-server/pom.xml
+++ b/integrations/apache-karaf/karaf-demo-server/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>apache-karaf</artifactId>
     <groupId>org.apache.plc4x</groupId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>karaf-demo-server</artifactId>
@@ -51,35 +51,35 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>karaf-ads-feature</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>karaf-ethernet-ip-feature</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>karaf-modbus-feature</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>karaf-s7-feature</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>karaf-simulated-feature</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
diff --git a/integrations/apache-karaf/karaf-ethernet-ip-feature/pom.xml b/integrations/apache-karaf/karaf-ethernet-ip-feature/pom.xml
index 4c1ae8b..432a166 100644
--- a/integrations/apache-karaf/karaf-ethernet-ip-feature/pom.xml
+++ b/integrations/apache-karaf/karaf-ethernet-ip-feature/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>apache-karaf</artifactId>
     <groupId>org.apache.plc4x</groupId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>karaf-ethernet-ip-feature</artifactId>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-ethernet-ip</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
   </dependencies>
 
diff --git a/integrations/apache-karaf/karaf-modbus-feature/pom.xml b/integrations/apache-karaf/karaf-modbus-feature/pom.xml
index b053576..bb5d196 100644
--- a/integrations/apache-karaf/karaf-modbus-feature/pom.xml
+++ b/integrations/apache-karaf/karaf-modbus-feature/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>apache-karaf</artifactId>
     <groupId>org.apache.plc4x</groupId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>karaf-modbus-feature</artifactId>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-modbus</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
   </dependencies>
 
diff --git a/integrations/apache-karaf/karaf-s7-feature/pom.xml b/integrations/apache-karaf/karaf-s7-feature/pom.xml
index 458128d..2260126 100644
--- a/integrations/apache-karaf/karaf-s7-feature/pom.xml
+++ b/integrations/apache-karaf/karaf-s7-feature/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>apache-karaf</artifactId>
     <groupId>org.apache.plc4x</groupId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>karaf-s7-feature</artifactId>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
   </dependencies>
 
diff --git a/integrations/apache-karaf/karaf-simulated-feature/pom.xml b/integrations/apache-karaf/karaf-simulated-feature/pom.xml
index 12fe3f0..53065a3 100644
--- a/integrations/apache-karaf/karaf-simulated-feature/pom.xml
+++ b/integrations/apache-karaf/karaf-simulated-feature/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>apache-karaf</artifactId>
     <groupId>org.apache.plc4x</groupId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>karaf-simulated-feature</artifactId>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
   </dependencies>
 
diff --git a/integrations/apache-karaf/pom.xml b/integrations/apache-karaf/pom.xml
index ea273ae..3bc1653 100644
--- a/integrations/apache-karaf/pom.xml
+++ b/integrations/apache-karaf/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>integrations</artifactId>
     <groupId>org.apache.plc4x</groupId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>apache-karaf</artifactId>
diff --git a/integrations/apache-mynewt/pom.xml b/integrations/apache-mynewt/pom.xml
index b814c5b..7308119 100644
--- a/integrations/apache-mynewt/pom.xml
+++ b/integrations/apache-mynewt/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>integrations</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>apache-mynewt</artifactId>
diff --git a/integrations/apache-nifi/nifi-plc4x-nar/pom.xml b/integrations/apache-nifi/nifi-plc4x-nar/pom.xml
index 9c37146..ff237c0 100644
--- a/integrations/apache-nifi/nifi-plc4x-nar/pom.xml
+++ b/integrations/apache-nifi/nifi-plc4x-nar/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>apache-nifi</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>nifi-plc4x-nar</artifactId>
@@ -36,39 +36,39 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>nifi-plc4x-processors</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <!-- PLC4X -->
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <!-- Bundle Drivers -->
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-ads</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-ethernet-ip</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-modbus</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
   </dependencies>
 
diff --git a/integrations/apache-nifi/nifi-plc4x-processors/pom.xml b/integrations/apache-nifi/nifi-plc4x-processors/pom.xml
index f03a02c..ac61767 100644
--- a/integrations/apache-nifi/nifi-plc4x-processors/pom.xml
+++ b/integrations/apache-nifi/nifi-plc4x-processors/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>apache-nifi</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>nifi-plc4x-processors</artifactId>
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.nifi</groupId>
diff --git a/integrations/apache-nifi/pom.xml b/integrations/apache-nifi/pom.xml
index c6fe985..f3c6a37 100644
--- a/integrations/apache-nifi/pom.xml
+++ b/integrations/apache-nifi/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>integrations</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>apache-nifi</artifactId>
diff --git a/integrations/pom.xml b/integrations/pom.xml
index 04cbbd8..2864dd7 100644
--- a/integrations/pom.xml
+++ b/integrations/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4x-parent</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>integrations</artifactId>
diff --git a/plc4c/pom.xml b/plc4c/pom.xml
index 6b702b5..3a02503 100644
--- a/plc4c/pom.xml
+++ b/plc4c/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4x-parent</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4c</artifactId>
diff --git a/plc4cpp/api/pom.xml b/plc4cpp/api/pom.xml
index aa7c7ab..9eb711e 100644
--- a/plc4cpp/api/pom.xml
+++ b/plc4cpp/api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4cpp</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4cpp-api</artifactId>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4cpp-libs</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <type>pom</type>
     </dependency>
   </dependencies>
diff --git a/plc4cpp/libs/pom.xml b/plc4cpp/libs/pom.xml
index 74d1933..f067ce9 100644
--- a/plc4cpp/libs/pom.xml
+++ b/plc4cpp/libs/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4cpp</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4cpp-libs</artifactId>
diff --git a/plc4cpp/pom.xml b/plc4cpp/pom.xml
index 03bd4f5..e9b2d01 100644
--- a/plc4cpp/pom.xml
+++ b/plc4cpp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4x-parent</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4cpp</artifactId>
diff --git a/plc4j/api/pom.xml b/plc4j/api/pom.xml
index 0ad5abe..505fa22 100644
--- a/plc4j/api/pom.xml
+++ b/plc4j/api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-api</artifactId>
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/plc4j/drivers/ads/pom.xml b/plc4j/drivers/ads/pom.xml
index 0458d0b..b1fcc15 100644
--- a/plc4j/drivers/ads/pom.xml
+++ b/plc4j/drivers/ads/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-drivers</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-driver-ads</artifactId>
@@ -35,27 +35,27 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-ads</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base-serial</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
@@ -83,13 +83,13 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/plc4j/drivers/ethernet-ip/pom.xml b/plc4j/drivers/ethernet-ip/pom.xml
index 063901e..b6a2209 100644
--- a/plc4j/drivers/ethernet-ip/pom.xml
+++ b/plc4j/drivers/ethernet-ip/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-drivers</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-driver-ethernet-ip</artifactId>
@@ -39,23 +39,23 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-ethernet-ip</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
diff --git a/plc4j/drivers/modbus/pom.xml b/plc4j/drivers/modbus/pom.xml
index cd62696..de23709 100644
--- a/plc4j/drivers/modbus/pom.xml
+++ b/plc4j/drivers/modbus/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-drivers</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-driver-modbus</artifactId>
@@ -35,28 +35,28 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-modbus</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base-serial</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/plc4j/drivers/pom.xml b/plc4j/drivers/pom.xml
index c303e43..8298ba3 100644
--- a/plc4j/drivers/pom.xml
+++ b/plc4j/drivers/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-drivers</artifactId>
diff --git a/plc4j/drivers/s7/pom.xml b/plc4j/drivers/s7/pom.xml
index 84e72f1..26fddc8 100644
--- a/plc4j/drivers/s7/pom.xml
+++ b/plc4j/drivers/s7/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-drivers</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-driver-s7</artifactId>
@@ -35,33 +35,33 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-iso-on-tcp</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-iso-tp</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-s7</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -109,13 +109,13 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/plc4j/drivers/simulated/pom.xml b/plc4j/drivers/simulated/pom.xml
index 86304dd..49badc9 100644
--- a/plc4j/drivers/simulated/pom.xml
+++ b/plc4j/drivers/simulated/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-drivers</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-driver-simulated</artifactId>
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/plc4j/pom.xml b/plc4j/pom.xml
index a18fc21..6f2f576 100644
--- a/plc4j/pom.xml
+++ b/plc4j/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4x-parent</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j</artifactId>
diff --git a/plc4j/protocols/ads/pom.xml b/plc4j/protocols/ads/pom.xml
index 199886b..ba4d8c1 100644
--- a/plc4j/protocols/ads/pom.xml
+++ b/plc4j/protocols/ads/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-protocols</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-protocol-ads</artifactId>
@@ -36,12 +36,12 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/plc4j/protocols/benchmarks/pom.xml b/plc4j/protocols/benchmarks/pom.xml
index 47b5cc2..252ac50 100644
--- a/plc4j/protocols/benchmarks/pom.xml
+++ b/plc4j/protocols/benchmarks/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>plc4j-protocols</artifactId>
     <groupId>org.apache.plc4x</groupId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-protocol-benchmarks</artifactId>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-ads</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
diff --git a/plc4j/protocols/delta-v/pom.xml b/plc4j/protocols/delta-v/pom.xml
index 60bcd21..e2ab486 100644
--- a/plc4j/protocols/delta-v/pom.xml
+++ b/plc4j/protocols/delta-v/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-protocols</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-protocol-delta-v</artifactId>
diff --git a/plc4j/protocols/driver-bases/base/pom.xml b/plc4j/protocols/driver-bases/base/pom.xml
index 938f87c..a17492d 100644
--- a/plc4j/protocols/driver-bases/base/pom.xml
+++ b/plc4j/protocols/driver-bases/base/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-protocols-driver-bases</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-protocol-driver-base</artifactId>
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
diff --git a/plc4j/protocols/driver-bases/pom.xml b/plc4j/protocols/driver-bases/pom.xml
index 3241b2a..6231bd4 100644
--- a/plc4j/protocols/driver-bases/pom.xml
+++ b/plc4j/protocols/driver-bases/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-protocols</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-protocols-driver-bases</artifactId>
diff --git a/plc4j/protocols/driver-bases/raw-socket/pom.xml b/plc4j/protocols/driver-bases/raw-socket/pom.xml
index dedd038..9b28cf3 100644
--- a/plc4j/protocols/driver-bases/raw-socket/pom.xml
+++ b/plc4j/protocols/driver-bases/raw-socket/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-protocols-driver-bases</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-protocol-driver-base-raw-socket</artifactId>
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <!--dependency>
diff --git a/plc4j/protocols/driver-bases/serial/pom.xml b/plc4j/protocols/driver-bases/serial/pom.xml
index 491a330..67097f1 100644
--- a/plc4j/protocols/driver-bases/serial/pom.xml
+++ b/plc4j/protocols/driver-bases/serial/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-protocols-driver-bases</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-protocol-driver-base-serial</artifactId>
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
diff --git a/plc4j/protocols/driver-bases/tcp/pom.xml b/plc4j/protocols/driver-bases/tcp/pom.xml
index f216a72..a75631a 100644
--- a/plc4j/protocols/driver-bases/tcp/pom.xml
+++ b/plc4j/protocols/driver-bases/tcp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-protocols-driver-bases</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-protocol-driver-base-tcp</artifactId>
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
diff --git a/plc4j/protocols/driver-bases/test/pom.xml b/plc4j/protocols/driver-bases/test/pom.xml
index 8f8eb14..b8bb6a9 100644
--- a/plc4j/protocols/driver-bases/test/pom.xml
+++ b/plc4j/protocols/driver-bases/test/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-protocols-driver-bases</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-protocol-driver-base-test</artifactId>
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
diff --git a/plc4j/protocols/ethernet-ip/pom.xml b/plc4j/protocols/ethernet-ip/pom.xml
index 19b6a8d..b33942a 100644
--- a/plc4j/protocols/ethernet-ip/pom.xml
+++ b/plc4j/protocols/ethernet-ip/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-protocols</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-protocol-ethernet-ip</artifactId>
@@ -40,12 +40,12 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
diff --git a/plc4j/protocols/iso-on-tcp/pom.xml b/plc4j/protocols/iso-on-tcp/pom.xml
index 7ae7d93..3db4d37 100644
--- a/plc4j/protocols/iso-on-tcp/pom.xml
+++ b/plc4j/protocols/iso-on-tcp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-protocols</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-protocol-iso-on-tcp</artifactId>
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/plc4j/protocols/iso-tp/pom.xml b/plc4j/protocols/iso-tp/pom.xml
index 01c1cb4..7d4cdaf 100644
--- a/plc4j/protocols/iso-tp/pom.xml
+++ b/plc4j/protocols/iso-tp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-protocols</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-protocol-iso-tp</artifactId>
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-iso-on-tcp</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/plc4j/protocols/modbus/pom.xml b/plc4j/protocols/modbus/pom.xml
index dc58302..1dd7b56 100644
--- a/plc4j/protocols/modbus/pom.xml
+++ b/plc4j/protocols/modbus/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-protocols</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-protocol-modbus</artifactId>
@@ -40,12 +40,12 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
@@ -96,7 +96,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/plc4j/protocols/pom.xml b/plc4j/protocols/pom.xml
index 89ec722..b454ced 100644
--- a/plc4j/protocols/pom.xml
+++ b/plc4j/protocols/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-protocols</artifactId>
diff --git a/plc4j/protocols/s7/pom.xml b/plc4j/protocols/s7/pom.xml
index 4a5d70f..dd5fc0f 100644
--- a/plc4j/protocols/s7/pom.xml
+++ b/plc4j/protocols/s7/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-protocols</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-protocol-s7</artifactId>
@@ -35,17 +35,17 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-iso-tp</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
@@ -95,7 +95,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
index d52d4cc..aeba6b6 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/S7Protocol.java
@@ -28,6 +28,7 @@
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.plc4x.java.api.exceptions.PlcProtocolException;
 import org.apache.plc4x.java.api.exceptions.PlcProtocolPayloadTooBigException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
 import org.apache.plc4x.java.isotp.protocol.IsoTPProtocol;
 import org.apache.plc4x.java.isotp.protocol.events.IsoTPConnectedEvent;
 import org.apache.plc4x.java.isotp.protocol.model.IsoTPMessage;
@@ -221,10 +222,12 @@
 
     private void encodePayloads(S7Message in, ByteBuf buf) throws PlcProtocolException {
         if(in.getPayloads() != null) {
-            for (S7Payload payload : in.getPayloads()) {
+            Iterator<S7Payload> payloadIterator = in.getPayloads().iterator();
+            while(payloadIterator.hasNext()) {
+                S7Payload payload = payloadIterator.next();
                 switch (payload.getType()) {
                     case WRITE_VAR:
-                        encodeWriteVarPayload((VarPayload) payload, buf);
+                        encodeWriteVarPayload((VarPayload) payload, buf, !payloadIterator.hasNext());
                         break;
                     case CPU_SERVICES:
                         encodeCpuServicesPayload((CpuServicesPayload) payload, buf);
@@ -237,14 +240,17 @@
         }
     }
 
-    private void encodeWriteVarPayload(VarPayload varPayload, ByteBuf buf) {
+    private void encodeWriteVarPayload(VarPayload varPayload, ByteBuf buf, boolean lastItem) {
         for (VarPayloadItem payloadItem : varPayload.getItems()) {
             buf.writeByte(payloadItem.getReturnCode().getCode());
             buf.writeByte(payloadItem.getDataTransportSize().getCode());
             // TODO: Check if this is correct?!?! Might be problems with sizeInBits = true/false
             buf.writeShort(payloadItem.getData().length);
             buf.writeBytes(payloadItem.getData());
-            // TODO: It looks as if BIT type reads require a 0x00 fill byte at the end ...
+            // if this is not the last item and it's payload is exactly one byte, we need to output a fill-byte.
+            if((payloadItem.getData().length == 1) && !lastItem) {
+                buf.writeByte(0x00);
+            }
         }
     }
 
@@ -613,9 +619,9 @@
                 VarPayloadItem payload = new VarPayloadItem(dataTransportErrorCode, dataTransportSize, data);
                 payloadItems.add(payload);
                 i += S7SizeHelper.getPayloadLength(payload);
-                // It seems that datatype BIT reads an additional byte, if it's not the last.
 
-                if(dataTransportSize.isHasBlankByte() && (userData.readableBytes() > 0)) {
+                // It seems that odd-byte payloads require a fill byte, but only if it's not the last item.
+                if((length % 2== 1) && (userData.readableBytes() > 0)) {
                     userData.readByte();
                     i++;
                 }
@@ -752,7 +758,11 @@
                 TransportSize dataType = TransportSize.valueOf(in.readByte());
                 short length = in.readShort();
                 short dbNumber = in.readShort();
-                MemoryArea memoryArea = MemoryArea.valueOf(in.readByte());
+                byte memoryAreaCode = in.readByte();
+                MemoryArea memoryArea = MemoryArea.valueOf(memoryAreaCode);
+                if(memoryArea == null) {
+                    throw new PlcRuntimeException("Unknown memory area '" + memoryAreaCode + "'");
+                }
                 short byteAddress = (short) (in.readShort() << 5);
                 byte tmp = in.readByte();
                 // Only the least 3 bits are the bit address, the
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportSize.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportSize.java
index d571015..e93a34e 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportSize.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportSize.java
@@ -25,13 +25,13 @@
  * (Values determined by evaluating generated ".pcap" files)
  */
 public enum DataTransportSize {
-    NULL((byte) 0x00, false, false),
-    BIT((byte) 0x03, true, true),
-    BYTE_WORD_DWORD((byte) 0x04, true, false),
-    INTEGER((byte) 0x05, true, false),
-    DINTEGER((byte) 0x06, false, false),
-    REAL((byte) 0x07, false, false),
-    OCTET_STRING((byte) 0x09, false, false);
+    NULL((byte) 0x00, false),
+    BIT((byte) 0x03, true),
+    BYTE_WORD_DWORD((byte) 0x04, true),
+    INTEGER((byte) 0x05, true),
+    DINTEGER((byte) 0x06, false),
+    REAL((byte) 0x07, false),
+    OCTET_STRING((byte) 0x09, false);
 
     private static final Map<Byte, DataTransportSize> map;
     static {
@@ -43,12 +43,10 @@
 
     private final byte code;
     private final boolean sizeInBits;
-    private final boolean hasBlankByte;
 
-    DataTransportSize(byte code, boolean sizeInBits, boolean hasBlankByte) {
+    DataTransportSize(byte code, boolean sizeInBits) {
         this.code = code;
         this.sizeInBits = sizeInBits;
-        this.hasBlankByte = hasBlankByte;
     }
 
     public byte getCode() {
@@ -59,10 +57,6 @@
         return sizeInBits;
     }
 
-    public boolean isHasBlankByte() {
-        return hasBlankByte;
-    }
-
     public static DataTransportSize valueOf(byte code) {
         return map.get(code);
     }
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java
index 104f65f..107687c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java
@@ -30,7 +30,7 @@
     DIRECT_PERIPHERAL_ACCESS("D", (byte) 0x80), // TODO: Double check shortName
     INPUTS("I", (byte) 0x81),
     OUTPUTS("Q", (byte) 0x82),
-    FLAGS("F", (byte) 0x83), // TODO: Double check shortName
+    FLAGS_MARKERS("M", (byte) 0x83),
     DATA_BLOCKS("DB", (byte) 0x84),
     INSTANCE_DATA_BLOCKS("DBI", (byte) 0x85), // TODO: Double check shortName
     LOCAL_DATA("LD", (byte) 0x86); // TODO: Double check shortName
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java
index 41db08a..a89bd93 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java
@@ -405,36 +405,28 @@
                 if(requestItem.getNumElements() != responseParameterItem.getNumElements()) {
                     int itemSizeInBytes = requestItem.getDataType().getSizeInBytes();
                     int totalSizeInBytes = requestItem.getNumElements() * itemSizeInBytes;
-                    byte[] data = null;
                     if(varParameter.getType() == ParameterType.READ_VAR) {
-                        data = new byte[totalSizeInBytes];
+                        byte[] data = new byte[totalSizeInBytes];
                         System.arraycopy(responsePayloadItem.getData(), 0, data, 0, responsePayloadItem.getData().length);
-                    }
 
-                    // Initialize the current size, this will be lower than the original, as the only
-                    // way to have different count, is if the request was split up.
-                    int curSizeInBytes = requestItem.getNumElements() * itemSizeInBytes;
+                        // Now iterate over the succeeding pairs of parameters and payloads till we have
+                        // found the original number of elements.
+                        while (dataOffset < totalSizeInBytes) {
+                            responseOffset++;
 
-                    // Now iterate over the succeeding pairs of parameters and payloads till we have
-                    // found the original number of elements.
-                    while(curSizeInBytes < totalSizeInBytes) {
-                        responseOffset++;
-                        // No need to process the parameters, we only need them to get the number of items.
-                        responseParameterItem = (S7AnyVarParameterItem) parameterItems.get(i + responseOffset);
-                        curSizeInBytes += responseParameterItem.getNumElements() * itemSizeInBytes;
+                            // Get the next payload item in the list.
+                            responsePayloadItem = payloadItems.get(i + responseOffset);
 
-                        // Get the next payload item in the list.
-                        responsePayloadItem = payloadItems.get(i + responseOffset);
-
-                        // Copy the data of this item behind the previous content.
-                        if(varParameter.getType() == ParameterType.READ_VAR) {
-                            System.arraycopy(responsePayloadItem.getData(), 0, data, dataOffset, responsePayloadItem.getData().length);
-                            dataOffset += responsePayloadItem.getData().length;
+                            // Copy the data of this item behind the previous content.
+                            if (varParameter.getType() == ParameterType.READ_VAR) {
+                                System.arraycopy(responsePayloadItem.getData(), 0, data, dataOffset, responsePayloadItem.getData().length);
+                                dataOffset += responsePayloadItem.getData().length;
+                            }
                         }
-                    }
 
-                    mergedPayloadItems.add(new VarPayloadItem(DataTransportErrorCode.OK,
-                        responsePayloadItem.getDataTransportSize(), data));
+                        mergedPayloadItems.add(new VarPayloadItem(DataTransportErrorCode.OK,
+                            responsePayloadItem.getDataTransportSize(), data));
+                    }
                 } else {
                     mergedPayloadItems.add(responsePayloadItem);
                 }
diff --git a/plc4j/utils/connection-pool/pom.xml b/plc4j/utils/connection-pool/pom.xml
index be5666e..8575455 100644
--- a/plc4j/utils/connection-pool/pom.xml
+++ b/plc4j/utils/connection-pool/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>plc4j-utils</artifactId>
     <groupId>org.apache.plc4x</groupId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-connection-pool</artifactId>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/plc4j/utils/opm/pom.xml b/plc4j/utils/opm/pom.xml
index 5952f23..bf4f4d1 100644
--- a/plc4j/utils/opm/pom.xml
+++ b/plc4j/utils/opm/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>plc4j-utils</artifactId>
     <groupId>org.apache.plc4x</groupId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-opm</artifactId>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <!-- Utils -->
@@ -69,19 +69,19 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-simulated</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/plc4j/utils/pom.xml b/plc4j/utils/pom.xml
index 868918f..c46a78b 100644
--- a/plc4j/utils/pom.xml
+++ b/plc4j/utils/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-utils</artifactId>
diff --git a/plc4j/utils/raw-sockets/pom.xml b/plc4j/utils/raw-sockets/pom.xml
index abcde7d..ec944f0 100644
--- a/plc4j/utils/raw-sockets/pom.xml
+++ b/plc4j/utils/raw-sockets/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-utils</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-utils-raw-sockets</artifactId>
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-utils-test-utils</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/plc4j/utils/scraper/pom.xml b/plc4j/utils/scraper/pom.xml
index e5a13d0..0372b72 100644
--- a/plc4j/utils/scraper/pom.xml
+++ b/plc4j/utils/scraper/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>plc4j-utils</artifactId>
     <groupId>org.apache.plc4x</groupId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-scraper</artifactId>
@@ -58,12 +58,12 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-api</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-connection-pool</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
     </dependency>
 
     <dependency>
@@ -82,19 +82,19 @@
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-s7</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-protocol-driver-base-test</artifactId>
-      <version>0.3.0</version>
+      <version>0.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/plc4j/utils/test-utils/pom.xml b/plc4j/utils/test-utils/pom.xml
index b5bface..20069eb 100644
--- a/plc4j/utils/test-utils/pom.xml
+++ b/plc4j/utils/test-utils/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4j-utils</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4j-utils-test-utils</artifactId>
diff --git a/plc4s/pom.xml b/plc4s/pom.xml
index f76672d..8a078ec 100644
--- a/plc4s/pom.xml
+++ b/plc4s/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4x-parent</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>plc4s</artifactId>
diff --git a/pom.xml b/pom.xml
index 1ab245d..480f564 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>org.apache.plc4x</groupId>
   <artifactId>plc4x-parent</artifactId>
-  <version>0.3.0</version>
+  <version>0.3.1</version>
   <packaging>pom</packaging>
 
   <name>PLC4X</name>
@@ -44,7 +44,7 @@
     <connection>scm:git:https://gitbox.apache.org/repos/asf/incubator-plc4x.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/incubator-plc4x.git</developerConnection>
     <url>https://github.com/apache/incubator-plc4x</url>
-    <tag>release/0.3.0</tag>
+    <tag>release/0.3.1</tag>
   </scm>
 
   <!-- Only configure the site distribution as the rest is handled by the apache parent -->
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 8f407e5..76cec4f 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.plc4x</groupId>
     <artifactId>plc4x-parent</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
   </parent>
 
   <artifactId>protocols</artifactId>