diff --git a/Code/Arduino/HanReader/HanReader.vcxitems.filters b/Code/Arduino/HanReader/HanReader.vcxitems.filters
index 16a3ef5a..53bf2bff 100644
--- a/Code/Arduino/HanReader/HanReader.vcxitems.filters
+++ b/Code/Arduino/HanReader/HanReader.vcxitems.filters
@@ -11,13 +11,13 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="C:\Users\roarf\OneDrive\Documents\GitHub\AmsToMqttBridge\Code\Arduino\HanReader\src\Crc16.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)src\Crc16.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="C:\Users\roarf\OneDrive\Documents\GitHub\AmsToMqttBridge\Code\Arduino\HanReader\src\DlmsReader.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)src\DlmsReader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="C:\Users\roarf\OneDrive\Documents\GitHub\AmsToMqttBridge\Code\Arduino\HanReader\src\HanReader.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)src\HanReader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -27,19 +27,19 @@
     <Text Include="$(MSBuildThisFileDirectory)keywords.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="C:\Users\roarf\OneDrive\Documents\GitHub\AmsToMqttBridge\Code\Arduino\HanReader\src\Crc16.h">
+    <ClInclude Include="$(MSBuildThisFileDirectory)src\Crc16.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="C:\Users\roarf\OneDrive\Documents\GitHub\AmsToMqttBridge\Code\Arduino\HanReader\src\DlmsReader.h">
+    <ClInclude Include="$(MSBuildThisFileDirectory)src\DlmsReader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="C:\Users\roarf\OneDrive\Documents\GitHub\AmsToMqttBridge\Code\Arduino\HanReader\src\HanReader.h">
+    <ClInclude Include="$(MSBuildThisFileDirectory)src\HanReader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="C:\Users\roarf\OneDrive\Documents\GitHub\AmsToMqttBridge\Code\Arduino\HanReader\src\Kaifa.h">
+    <ClInclude Include="$(MSBuildThisFileDirectory)src\Kaifa.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="C:\Users\roarf\OneDrive\Documents\GitHub\AmsToMqttBridge\Code\Arduino\HanReader\src\Kamstrup.h">
+    <ClInclude Include="$(MSBuildThisFileDirectory)src\Kamstrup.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/Code/Arduino/HanReader/src/HanReader.cpp b/Code/Arduino/HanReader/src/HanReader.cpp
index 02993f11..298f984f 100644
--- a/Code/Arduino/HanReader/src/HanReader.cpp
+++ b/Code/Arduino/HanReader/src/HanReader.cpp
@@ -35,11 +35,56 @@ bool HanReader::read(byte data)
 	if (reader.Read(data))
 	{
 		bytesRead = reader.GetRawData(buffer, 0, 512);
-		listSize = getInt(1, buffer, 0, bytesRead);
+		if (debug)
+		{
+			debug->print("Got valid DLMS data (");
+			debug->print(bytesRead);
+			debug->println(" bytes):");
+			debugPrint(buffer, 0, bytesRead);
+		}
+
+		/*
+			Data should start with E6 E7 00 0F
+			and continue with four bytes for the InvokeId
+		*/
+		if (bytesRead < 9)
+		{
+			if (debug) debug->println("Invalid HAN data: Less than 9 bytes received");
+			return false;
+		}
+		else if (
+			buffer[0] != 0xE6 || 
+			buffer[1] != 0xE7 ||
+			buffer[2] != 0x00 ||
+			buffer[3] != 0x0F
+		)
+		{
+			if (debug) debug->println("Invalid HAN data: Start should be E6 E7 00 0F");
+			return false;
+		}
+
+		if (debug) debug->println("HAN data is valid");
+		listSize = getInt(0, buffer, 0, bytesRead);
 		return true;
 	}
 }
 
+void HanReader::debugPrint(byte *buffer, int start, int length)
+{
+	for (int i = start; i < start + length; i++)
+	{
+		if (buffer[i] < 0x10)
+			debug->print("0");
+		debug->print(buffer[i], HEX);
+		debug->print(" ");
+		if ((i - start + 1) % 16 == 0)
+			debug->println("");
+		else if ((i - start + 1) % 4 == 0)
+			debug->print(" ");
+	}
+	debug->println("");
+}
+
 bool HanReader::read()
 {
 	if (han->available())
@@ -57,7 +102,10 @@ int HanReader::getListSize()
 
 time_t HanReader::getPackageTime()
 {
-	return getTime(0);
+	int packageTimePosition = dataHeader 
+		+ (compensateFor09HeaderBug ? 1 : 0);
+
+	return getTime(buffer, packageTimePosition, bytesRead);
 }
 
 time_t HanReader::getTime(int objectId)
@@ -78,7 +126,12 @@ String HanReader::getString(int objectId)
 
 int HanReader::findValuePosition(int dataPosition, byte *buffer, int start, int length)
 {
-	for (int i = start + dataHeader; i<length; i++)
+	// The first byte after the header gives the length 
+	// of the extended header information (variable)
+	int headerSize = dataHeader + (compensateFor09HeaderBug ? 1 : 0);
+	int firstData = headerSize + buffer[headerSize] + 1;
+
+	for (int i = start + firstData; i<length; i++)
 	{
 		if (dataPosition-- == 0)
 			return i;
@@ -117,18 +170,33 @@ time_t HanReader::getTime(int dataPosition, byte *buffer, int start, int length)
 {
 	// TODO: check if the time is represented always as a 12 byte string (0x09 0x0C)
 	int timeStart = findValuePosition(dataPosition, buffer, start, length);
-	timeStart += 2;
+	timeStart += 1;
+	return getTime(buffer, start + timeStart, length - timeStart);
+}
 
-	int year = buffer[start + timeStart] << 8 |
-		buffer[start + timeStart + 1];
+time_t HanReader::getTime(byte *buffer, int start, int length)
+{
+	int pos = start;
+	int dataLength = buffer[pos++];
 
-	int month = buffer[start + timeStart + 2];
-	int day = buffer[start + timeStart + 3];
-	int hour = buffer[start + timeStart + 5];
-	int minute = buffer[start + timeStart + 6];
-	int second = buffer[start + timeStart + 7];
+	if (dataLength == 0x0C)
+	{
+		int year = buffer[pos] << 8 |
+			buffer[pos + 1];
 
-	return toUnixTime(year, month, day, hour, minute, second);
+		int month = buffer[pos + 2];
+		int day = buffer[pos + 3];
+		int hour = buffer[pos + 5];
+		int minute = buffer[pos + 6];
+		int second = buffer[pos + 7];
+
+		return toUnixTime(year, month, day, hour, minute, second);
+	}
+	else
+	{
+		// Date format not supported
+		return (time_t)0L;
+	}
 }
 
 int HanReader::getInt(int dataPosition, byte *buffer, int start, int length)
diff --git a/Code/Arduino/HanReader/src/HanReader.h b/Code/Arduino/HanReader/src/HanReader.h
index 49175964..7818ff0b 100644
--- a/Code/Arduino/HanReader/src/HanReader.h
+++ b/Code/Arduino/HanReader/src/HanReader.h
@@ -15,6 +15,7 @@ class HanReader
 {
 public:
 	const uint dataHeader = 8;
+	bool compensateFor09HeaderBug = false;
 
 	HanReader();
 	void setup(HardwareSerial *hanPort);
@@ -38,11 +39,14 @@ private:
 
 	int findValuePosition(int dataPosition, byte *buffer, int start, int length);
 
-	long getTime(int dataPosition, byte *buffer, int start, int length);
+	time_t getTime(int dataPosition, byte *buffer, int start, int length);
+	time_t getTime(byte *buffer, int start, int length);
 	int getInt(int dataPosition, byte *buffer, int start, int length);
 	String getString(int dataPosition, byte *buffer, int start, int length);
 
 	time_t toUnixTime(int year, int month, int day, int hour, int minute, int second);
+
+	void debugPrint(byte *buffer, int start, int length);
 };
 
 
diff --git a/Code/Arduino/HanReader/src/Kaifa.h b/Code/Arduino/HanReader/src/Kaifa.h
index 54a7b2f8..517df221 100644
--- a/Code/Arduino/HanReader/src/Kaifa.h
+++ b/Code/Arduino/HanReader/src/Kaifa.h
@@ -8,13 +8,11 @@ enum class Kaifa : byte {
 };
 
 enum class Kaifa_List1 {
-	Time,
 	ListSize,
 	ActivePowerImported
 };
 
 enum class Kaifa_List2 {
-	Time,
 	ListSize,
 	ListVersionIdentifier,
 	MeterID,
@@ -32,7 +30,6 @@ enum class Kaifa_List2 {
 };
 
 enum class Kaifa_List3 {
-	Time,
 	ListSize,
 	ListVersionIdentifier,
 	MeterID,
diff --git a/Code/Arduino/HanReader/src/Kamstrup.h b/Code/Arduino/HanReader/src/Kamstrup.h
index f9ee0aef..609628d5 100644
--- a/Code/Arduino/HanReader/src/Kamstrup.h
+++ b/Code/Arduino/HanReader/src/Kamstrup.h
@@ -12,7 +12,6 @@ enum class Kamstrup
 
 enum class Kamstrup_List1
 {
-	Time,
 	ListSize,
 	ListVersionIdentifier,
 	MeterID_OBIS,
@@ -44,7 +43,6 @@ enum class Kamstrup_List1
 
 enum class Kamstrup_List2
 {
-	Time,
 	ListSize,
 	ListVersionIdentifier,
 	MeterID_OBIS,
diff --git a/Code/Arduino/KaifaTest/KaifaTest.ino b/Code/Arduino/KaifaTest/KaifaTest.ino
index 35090585..7222d075 100644
--- a/Code/Arduino/KaifaTest/KaifaTest.ino
+++ b/Code/Arduino/KaifaTest/KaifaTest.ino
@@ -30,6 +30,7 @@ void setup() {
 	// initialize the HanReader
 	// (passing no han port, as we are feeding data manually, but provide Serial for debugging)
 	hanReader.setup(NULL, &Serial);
+	hanReader.compensateFor09HeaderBug = true;
 }
 
 void setupDebugPort()
diff --git a/Code/Arduino/KamstrupTest/KamstrupTest.ino b/Code/Arduino/KamstrupTest/KamstrupTest.ino
index 46a19622..dc68b8bc 100644
--- a/Code/Arduino/KamstrupTest/KamstrupTest.ino
+++ b/Code/Arduino/KamstrupTest/KamstrupTest.ino
@@ -15,37 +15,33 @@ byte samples[] =
 // [2017-10-20 04.43.32.368 - Received 229 (0xE5) bytes]
 {
 	// List #1
-	0x7E, 0xA0, 0xE3, 0x2B, 0x21, 0x13, 0x98, 0x86,	0xE6, 0xE7, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,
-	0x09, 0x0C, 0x07, 0xE1, 0x0A, 0x14, 0x05, 0x03,	0x2B, 0x1E, 0xFF, 0x80, 0x00, 0x00, 0x02, 0x19,
-	0x0A, 0x0E, 0x4B, 0x61, 0x6D, 0x73, 0x74, 0x72,	0x75, 0x70, 0x5F, 0x56, 0x30, 0x30, 0x30, 0x31,
-	0x09, 0x06, 0x01, 0x01, 0x00, 0x00, 0x05, 0xFF,	0x0A, 0x10, 0x35, 0x37, 0x30, 0x36, 0x35, 0x36,
-	0x37, 0x32, 0x37, 0x34, 0x33, 0x38, 0x39, 0x37,	0x30, 0x32, 0x09, 0x06, 0x01, 0x01, 0x60, 0x01,
-	0x01, 0xFF, 0x0A, 0x12, 0x36, 0x38, 0x34, 0x31,	0x31, 0x32, 0x31, 0x42, 0x4E, 0x32, 0x34, 0x33,
-	0x31, 0x30, 0x31, 0x30, 0x34, 0x30, 0x09, 0x06,	0x01, 0x01, 0x01, 0x07, 0x00, 0xFF, 0x06, 0x00,
-	0x00, 0x05, 0xBC, 0x09, 0x06, 0x01, 0x01, 0x02,	0x07, 0x00, 0xFF, 0x06, 0x00, 0x00, 0x00, 0x00,
-	0x09, 0x06, 0x01, 0x01, 0x03, 0x07, 0x00, 0xFF,	0x06, 0x00, 0x00, 0x00, 0x00, 0x09, 0x06, 0x01,
-	0x01, 0x04, 0x07, 0x00, 0xFF, 0x06, 0x00, 0x00,	0x01, 0xCE, 0x09, 0x06, 0x01, 0x01, 0x1F, 0x07,
-	0x00, 0xFF, 0x06, 0x00, 0x00, 0x02, 0x34, 0x09,	0x06, 0x01, 0x01, 0x33, 0x07, 0x00, 0xFF, 0x06,
-	0x00, 0x00, 0x00, 0xCA, 0x09, 0x06, 0x01, 0x01,	0x47, 0x07, 0x00, 0xFF, 0x06, 0x00, 0x00, 0x01,
-	0xFF, 0x09, 0x06, 0x01, 0x01, 0x20, 0x07, 0x00,	0xFF, 0x12, 0x00, 0xE8, 0x09, 0x06, 0x01, 0x01,
-	0x34, 0x07, 0x00, 0xFF, 0x12, 0x00, 0xE4, 0x09,	0x06, 0x01, 0x01, 0x48, 0x07, 0x00, 0xFF, 0x12,
-	0x00, 0xE9, 0xA1, 0xA5, 0x7E,
+	0x7E, 0xA0, 0xE2, 0x2B, 0x21, 0x13, 0x23, 0x9A,  0xE6, 0xE7, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,  0x0C, 0x07, 0xE2, 0x03, 0x04, 0x07, 0x14, 0x3B, 
+	0x32, 0xFF, 0x80, 0x00, 0x00, 0x02, 0x19, 0x0A,  0x0E, 0x4B, 0x61, 0x6D, 0x73, 0x74, 0x72, 0x75,  0x70, 0x5F, 0x56, 0x30, 0x30, 0x30, 0x31, 0x09, 
+	0x06, 0x01, 0x01, 0x00, 0x00, 0x05, 0xFF, 0x0A,  0x10, 0x35, 0x37, 0x30, 0x36, 0x35, 0x36, 0x37,  0x32, 0x37, 0x34, 0x33, 0x38, 0x39, 0x37, 0x30, 
+	0x32, 0x09, 0x06, 0x01, 0x01, 0x60, 0x01, 0x01,  0xFF, 0x0A, 0x12, 0x36, 0x38, 0x34, 0x31, 0x31,  0x32, 0x31, 0x42, 0x4E, 0x32, 0x34, 0x33, 0x31, 
+	0x30, 0x31, 0x30, 0x34, 0x30, 0x09, 0x06, 0x01,  0x01, 0x01, 0x07, 0x00, 0xFF, 0x06, 0x00, 0x00,  0x11, 0x28, 0x09, 0x06, 0x01, 0x01, 0x02, 0x07, 
+	0x00, 0xFF, 0x06, 0x00, 0x00, 0x00, 0x00, 0x09,  0x06, 0x01, 0x01, 0x03, 0x07, 0x00, 0xFF, 0x06,  0x00, 0x00, 0x00, 0x84, 0x09, 0x06, 0x01, 0x01, 
+	0x04, 0x07, 0x00, 0xFF, 0x06, 0x00, 0x00, 0x00,  0x00, 0x09, 0x06, 0x01, 0x01, 0x1F, 0x07, 0x00,  0xFF, 0x06, 0x00, 0x00, 0x05, 0x66, 0x09, 0x06, 
+	0x01, 0x01, 0x33, 0x07, 0x00, 0xFF, 0x06, 0x00,  0x00, 0x03, 0x0C, 0x09, 0x06, 0x01, 0x01, 0x47,  0x07, 0x00, 0xFF, 0x06, 0x00, 0x00, 0x05, 0x5A, 
+	0x09, 0x06, 0x01, 0x01, 0x20, 0x07, 0x00, 0xFF,  0x12, 0x00, 0xE0, 0x09, 0x06, 0x01, 0x01, 0x34,  0x07, 0x00, 0xFF, 0x12, 0x00, 0xDF, 0x09, 0x06, 
+	0x01, 0x01, 0x48, 0x07, 0x00, 0xFF, 0x12, 0x00,  0xDF, 0xA1, 0xD8, 0x7E, 
 
 	// List #2
-	0x7E, 0xA1, 0x2D, 0x2B, 0x21, 0x13, 0x47, 0x18, 0xE6, 0xE7, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x09, 0x0C, 0x07, 0xE1, 0x0A, 0x14, 0x05, 0x05,
-	0x00, 0x05, 0xFF, 0x80, 0x00, 0x00, 0x02, 0x23, 0x0A, 0x0E, 0x4B, 0x61, 0x6D, 0x73, 0x74, 0x72, 0x75, 0x70, 0x5F, 0x56, 0x30, 0x30, 0x30, 0x31,
-	0x09, 0x06, 0x01, 0x01, 0x00, 0x00, 0x05, 0xFF, 0x0A, 0x10, 0x35, 0x37, 0x30, 0x36, 0x35, 0x36, 0x37, 0x32, 0x37, 0x34, 0x33, 0x38, 0x39, 0x37,
-	0x30, 0x32, 0x09, 0x06, 0x01, 0x01, 0x60, 0x01, 0x01, 0xFF, 0x0A, 0x12, 0x36, 0x38, 0x34, 0x31, 0x31, 0x32, 0x31, 0x42, 0x4E, 0x32, 0x34, 0x33,
-	0x31, 0x30, 0x31, 0x30, 0x34, 0x30, 0x09, 0x06, 0x01, 0x01, 0x01, 0x07, 0x00, 0xFF, 0x06, 0x00, 0x00, 0x0C, 0xF0, 0x09, 0x06, 0x01, 0x01, 0x02,
-	0x07, 0x00, 0xFF, 0x06, 0x00, 0x00, 0x00, 0x00, 0x09, 0x06, 0x01, 0x01, 0x03, 0x07, 0x00, 0xFF, 0x06, 0x00, 0x00, 0x00, 0x00, 0x09, 0x06, 0x01,
-	0x01, 0x04, 0x07, 0x00, 0xFF, 0x06, 0x00, 0x00, 0x01, 0xB9, 0x09, 0x06, 0x01, 0x01, 0x1F, 0x07, 0x00, 0xFF, 0x06, 0x00, 0x00, 0x05, 0x33, 0x09,
-	0x06, 0x01, 0x01, 0x33, 0x07, 0x00, 0xFF, 0x06, 0x00, 0x00, 0x00, 0xD5, 0x09, 0x06, 0x01, 0x01, 0x47, 0x07, 0x00, 0xFF, 0x06, 0x00, 0x00, 0x05,
-	0x25, 0x09, 0x06, 0x01, 0x01, 0x20, 0x07, 0x00, 0xFF, 0x12, 0x00, 0xE6, 0x09, 0x06, 0x01, 0x01, 0x34, 0x07, 0x00, 0xFF, 0x12, 0x00, 0xE2, 0x09,
-	0x06, 0x01, 0x01, 0x48, 0x07, 0x00, 0xFF, 0x12, 0x00, 0xE8, 0x09, 0x06, 0x00, 0x01, 0x01, 0x00, 0x00, 0xFF, 0x09, 0x0C, 0x07, 0xE1, 0x0A, 0x14,
-	0x05, 0x05, 0x00, 0x05, 0xFF, 0x80, 0x00, 0x00, 0x09, 0x06, 0x01, 0x01, 0x01, 0x08, 0x00, 0xFF, 0x06, 0x00, 0x06, 0x85, 0xB7, 0x09, 0x06, 0x01,
-	0x01, 0x02, 0x08, 0x00, 0xFF, 0x06, 0x00, 0x00, 0x00, 0x00, 0x09, 0x06, 0x01, 0x01, 0x03, 0x08, 0x00, 0xFF, 0x06, 0x00, 0x00, 0x00, 0x50, 0x09,
-	0x06, 0x01, 0x01, 0x04, 0x08, 0x00, 0xFF, 0x06, 0x00, 0x00, 0xF1, 0x97, 0x5C, 0x83, 0x7E
+	0x7E, 0xA1, 0x2C, 0x2B, 0x21, 0x13, 0xFC, 0x04,  0xE6, 0xE7, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,  0x0C, 0x07, 0xE2, 0x03, 0x04, 0x07, 0x15, 0x00, 
+	0x05, 0xFF, 0x80, 0x00, 0x00, 0x02, 0x23, 0x0A,  0x0E, 0x4B, 0x61, 0x6D, 0x73, 0x74, 0x72, 0x75,  0x70, 0x5F, 0x56, 0x30, 0x30, 0x30, 0x31, 0x09, 
+	0x06, 0x01, 0x01, 0x00, 0x00, 0x05, 0xFF, 0x0A,  0x10, 0x35, 0x37, 0x30, 0x36, 0x35, 0x36, 0x37,  0x32, 0x37, 0x34, 0x33, 0x38, 0x39, 0x37, 0x30, 
+	0x32, 0x09, 0x06, 0x01, 0x01, 0x60, 0x01, 0x01,  0xFF, 0x0A, 0x12, 0x36, 0x38, 0x34, 0x31, 0x31,  0x32, 0x31, 0x42, 0x4E, 0x32, 0x34, 0x33, 0x31, 
+	0x30, 0x31, 0x30, 0x34, 0x30, 0x09, 0x06, 0x01,  0x01, 0x01, 0x07, 0x00, 0xFF, 0x06, 0x00, 0x00,  0x0E, 0x3B, 0x09, 0x06, 0x01, 0x01, 0x02, 0x07, 
+	0x00, 0xFF, 0x06, 0x00, 0x00, 0x00, 0x00, 0x09,  0x06, 0x01, 0x01, 0x03, 0x07, 0x00, 0xFF, 0x06,  0x00, 0x00, 0x00, 0x86, 0x09, 0x06, 0x01, 0x01, 
+	0x04, 0x07, 0x00, 0xFF, 0x06, 0x00, 0x00, 0x00,  0x00, 0x09, 0x06, 0x01, 0x01, 0x1F, 0x07, 0x00,  0xFF, 0x06, 0x00, 0x00, 0x04, 0x21, 0x09, 0x06, 
+	0x01, 0x01, 0x33, 0x07, 0x00, 0xFF, 0x06, 0x00,  0x00, 0x03, 0x0C, 0x09, 0x06, 0x01, 0x01, 0x47,  0x07, 0x00, 0xFF, 0x06, 0x00, 0x00, 0x04, 0x1C, 
+	0x09, 0x06, 0x01, 0x01, 0x20, 0x07, 0x00, 0xFF,  0x12, 0x00, 0xE2, 0x09, 0x06, 0x01, 0x01, 0x34,  0x07, 0x00, 0xFF, 0x12, 0x00, 0xE0, 0x09, 0x06, 
+	0x01, 0x01, 0x48, 0x07, 0x00, 0xFF, 0x12, 0x00,  0xDF, 0x09, 0x06, 0x00, 0x01, 0x01, 0x00, 0x00,  0xFF, 0x09, 0x0C, 0x07, 0xE2, 0x03, 0x04, 0x07, 
+	0x15, 0x00, 0x05, 0xFF, 0x80, 0x00, 0x00, 0x09,  0x06, 0x01, 0x01, 0x01, 0x08, 0x00, 0xFF, 0x06,  0x00, 0x1A, 0x40, 0x49, 0x09, 0x06, 0x01, 0x01, 
+	0x02, 0x08, 0x00, 0xFF, 0x06, 0x00, 0x00, 0x00,  0x00, 0x09, 0x06, 0x01, 0x01, 0x03, 0x08, 0x00,  0xFF, 0x06, 0x00, 0x00, 0x05, 0x64, 0x09, 0x06, 
+	0x01, 0x01, 0x04, 0x08, 0x00, 0xFF, 0x06, 0x00,  0x02, 0x7B, 0x21, 0x20, 0x92, 0x7E
 };
+
 int sampleIndex = 0;
 
 void setup() {
diff --git a/Code/Arduino/KamstrupTest/KamstrupTest.vcxproj b/Code/Arduino/KamstrupTest/KamstrupTest.vcxproj
index d698c986..2c305a05 100644
--- a/Code/Arduino/KamstrupTest/KamstrupTest.vcxproj
+++ b/Code/Arduino/KamstrupTest/KamstrupTest.vcxproj
@@ -51,10 +51,10 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\KamstrupTest;$(ProjectDir)..\HanReader\src;$(ProjectDir)..\..\..\..\..\..\..\..\..\Program Files (x86)\Arduino\libraries;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\libraries;$(ProjectDir)..\..\..\..\..\..\..\Google Drive\Private\Elektronikk\Arduino\libraries;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266\libb64;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266\spiffs;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266\umm_malloc;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\variants\generic;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\tools\sdk\include;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\tools\sdk\lwip\include;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\1.20.0-26-gb404fb9-2\xtensa-lx106-elf\include\c++\4.8.2;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\1.20.0-26-gb404fb9-2\xtensa-lx106-elf\include\c++\4.8.2\xtensa-lx106-elf;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\1.20.0-26-gb404fb9-2\xtensa-lx106-elf\include;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\1.20.0-26-gb404fb9-2\lib\gcc\xtensa-lx106-elf\4.8.2\include;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\tools\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\KamstrupTest;$(ProjectDir)..\HanReader\src;$(ProjectDir)..\..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\Extensions\53ggn0bh.0i3\Micro Platforms\visualmicro\ide\libraries;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\libraries;$(ProjectDir)..\..\..\..\..\Arduino\libraries;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266\libb64;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266\spiffs;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266\umm_malloc;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\variants\generic;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\tools\sdk\include;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\tools\sdk\lwip\include;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\1.20.0-26-gb404fb9-2\xtensa-lx106-elf\include\c++\4.8.2;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\1.20.0-26-gb404fb9-2\xtensa-lx106-elf\include\c++\4.8.2\xtensa-lx106-elf;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\1.20.0-26-gb404fb9-2\xtensa-lx106-elf\include;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\1.20.0-26-gb404fb9-2\lib\gcc\xtensa-lx106-elf\4.8.2\include;$(ProjectDir)..\..\..\..\..\..\..\AppData\Local\arduino15\packages\esp8266\hardware\esp8266\2.3.0\tools\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(ProjectDir)__vm\.KamstrupTest.vsarduino.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <PreprocessorDefinitions>__ESP8266_ESp8266__;__ESP8266_ESP8266__;__ets__;ICACHE_FLASH;F_CPU=80000000L;LWIP_OPEN_SRC;ARDUINO=106012;ARDUINO_ESP8266_ESP01;ARDUINO_ARCH_ESP8266;ESP8266;__cplusplus=201103L;_VMICRO_INTELLISENSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__ESP8266_ESp8266__;__ESP8266_ESP8266__;_VMDEBUG=1;__ets__;ICACHE_FLASH;F_CPU=80000000L;LWIP_OPEN_SRC;ARDUINO=10801;ARDUINO_ESP8266_ESP01;ARDUINO_ARCH_ESP8266;ESP8266;__cplusplus=201103L;_VMICRO_INTELLISENSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>