diff --git a/doc/Austria/218_9_SmartMeter_Kundenschnittstelle_lektoriert_1410_Web.pdf b/doc/Austria/218_9_SmartMeter_Kundenschnittstelle_lektoriert_1410_Web.pdf
new file mode 100644
index 00000000..d95c2593
Binary files /dev/null and b/doc/Austria/218_9_SmartMeter_Kundenschnittstelle_lektoriert_1410_Web.pdf differ
diff --git a/doc/Austria/Beschreibung_Kundenschnittstelle_Smart_Meter_TINETZ.pdf b/doc/Austria/Beschreibung_Kundenschnittstelle_Smart_Meter_TINETZ.pdf
new file mode 100644
index 00000000..4d7aa0af
Binary files /dev/null and b/doc/Austria/Beschreibung_Kundenschnittstelle_Smart_Meter_TINETZ.pdf differ
diff --git a/doc/Germany/Anleitung_M-Bus_Protokoll_V1.0.pdf b/doc/Germany/Anleitung_M-Bus_Protokoll_V1.0.pdf
new file mode 100644
index 00000000..5e27e420
Binary files /dev/null and b/doc/Germany/Anleitung_M-Bus_Protokoll_V1.0.pdf differ
diff --git a/doc/M-Bus_DOC48.PDF b/doc/M-Bus_DOC48.PDF
new file mode 100644
index 00000000..7d187745
Binary files /dev/null and b/doc/M-Bus_DOC48.PDF differ
diff --git a/frames/Kamstrup-1p.raw b/frames/Kamstrup-1p.raw
new file mode 100644
index 00000000..9617d934
--- /dev/null
+++ b/frames/Kamstrup-1p.raw
@@ -0,0 +1,51 @@
+7E A0 BA 2B 21 13 ED AA E6 E7 00 0F 00 00 00 00
+0C 07 E6 02 05 06 0D 00 0A FF 80 00 00 
+02 19 
+0A 0E 4B 61 6D 73 74 72 75 70 5F 56 30 30 30 31 
+09 06 01 01 00 00 05 FF 0A 10 35 37 30 36 35 36 37 32 37 31 35 33 33 32 30 37 
+09 06 01 01 60 01 01 FF 0A 12 36 38 36 31 31 31 31 42 4E 32 34 32 31 30 31 30 34 30 
+09 06 01 01 01 07 00 FF 06 00 00 02 68 
+09 06 01 01 02 07 00 FF 06 00 00 00 00 
+09 06 01 01 03 07 00 FF 06 00 00 00 53 
+09 06 01 01 04 07 00 FF 06 00 00 00 00 
+09 06 01 01 1F 07 00 FF 06 00 00 01 22 
+00 00 00 00 
+09 06 01 01 20 07 00 FF 12 00 E2 
+00 00 00 00 
+05 D8 7E
+
+7E A0 BA 2B 21 13 ED AA E6 E7 00 0F 00 00 00 00
+0C 07 E6 02 05 06 0D 00 14 FF 80 00 00 
+02 19 
+0A 0E 4B 61 6D 73 74 72 75 70 5F 56 30 30 30 31 
+09 06 01 01 00 00 05 FF 0A 10 35 37 30 36 35 36 37 32 37 31 35 33 33 32 30 37 
+09 06 01 01 60 01 01 FF 0A 12 36 38 36 31 31 31 31 42 4E 32 34 32 31 30 31 30 34 30 
+09 06 01 01 01 07 00 FF 06 00 00 02 68 
+09 06 01 01 02 07 00 FF 06 00 00 00 00 
+09 06 01 01 03 07 00 FF 06 00 00 00 53 
+09 06 01 01 04 07 00 FF 06 00 00 00 00 
+09 06 01 01 1F 07 00 FF 06 00 00 01 23 
+00 00 00 00 
+09 06 01 01 20 07 00 FF 12 00 E1 
+00 00 00 00 
+8E 5E 7E
+
+7E A1 04 2B 21 13 77 6E E6 E7 00 0F 00 00 00 00
+0C 07 E6 02 05 06 0D 00 19 FF 80 00 00 
+02 23 0A 0E 4B 61 6D 73 74 72 75 70 5F 56 30 30 30 31 
+09 06 01 01 00 00 05 FF 0A 10 35 37 30 36 35 36 37 32 37 31 35 33 33 32 30 37 
+09 06 01 01 60 01 01 FF 0A 12 36 38 36 31 31 31 31 42 4E 32 34 32 31 30 31 30 34 30 
+09 06 01 01 01 07 00 FF 06 00 00 02 6B 
+09 06 01 01 02 07 00 FF 06 00 00 00 00 
+09 06 01 01 03 07 00 FF 06 00 00 00 54 
+09 06 01 01 04 07 00 FF 06 00 00 00 00 
+09 06 01 01 1F 07 00 FF 06 00 00 01 25 
+00 00 00 00 
+09 06 01 01 20 07 00 FF 12 00 E1 
+00 00 00 00 
+09 06 00 01 01 00 00 FF 09 0C 07 E6 02 05 06 0D 00 19 FF 80 00 00 
+09 06 01 01 01 08 00 FF 06 00 12 CF 93 
+09 06 01 01 02 08 00 FF 06 00 00 00 00
+09 06 01 01 03 08 00 FF 06 00 00 8C CE 
+09 06 01 01 04 08 00 FF 06 00 05 E5 04 
+7F E9 7E
diff --git a/src/IEC6205675.cpp b/src/IEC6205675.cpp
index d1501d12..94438a4f 100644
--- a/src/IEC6205675.cpp
+++ b/src/IEC6205675.cpp
@@ -395,7 +395,8 @@ CosemData* IEC6205675::getCosemDataAt(uint8_t index, const char* ptr) {
                 pos += 5;
                 break;
             case CosemTypeNull:
-                return NULL;
+                pos += 1;
+                break;
             default:
                 pos += 2;
         }
@@ -438,7 +439,8 @@ CosemData* IEC6205675::findObis(uint8_t* obis, int matchlength, const char* ptr)
                 pos += 5;
                 break;
             case CosemTypeNull:
-                return NULL;
+                pos += 1;
+                break;
             default:
                 pos += 2;
         }