diff --git a/HTTPmsg_CNL113312.tpd b/HTTPmsg_CNL113312.tpd
index 79575ba84583c64095b4679f5bce896d97087cd1..e505421669a970da29d1a04282915e05d96ee366 100644
--- a/HTTPmsg_CNL113312.tpd
+++ b/HTTPmsg_CNL113312.tpd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2015 Ericsson
+ Copyright (c) 2016 Ericsson
 
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
 
    File:               HTTPmsg_CNL113312.tpd
    Description:        tpd project file
-   Rev:                R8F
+   Rev:                R8G
    Prodnr:             CNL 113 312
 
  -->
diff --git a/demo/lssl_script b/demo/lssl_script
old mode 100755
new mode 100644
diff --git a/doc/FS_15517_CNL113_312_RevE.pdf b/doc/FS_15517-CNL113312_EN_E_PDFV1R2.pdf
similarity index 99%
rename from doc/FS_15517_CNL113_312_RevE.pdf
rename to doc/FS_15517-CNL113312_EN_E_PDFV1R2.pdf
index 50c898ceed16d956e950fe65a6f3a866b832035c..dcc542c739156b7d93b9298648e08e4fcce2e308 100644
Binary files a/doc/FS_15517_CNL113_312_RevE.pdf and b/doc/FS_15517-CNL113312_EN_E_PDFV1R2.pdf differ
diff --git a/doc/HTTPmsg_CNL113312_PRI.doc b/doc/HTTPmsg_CNL113312_PRI.doc
index 16481237d78e4d93c181db8e03e425a9ebb060a3..4822f45e06aa7a66818a08b6d4765d5fa35dc603 100644
Binary files a/doc/HTTPmsg_CNL113312_PRI.doc and b/doc/HTTPmsg_CNL113312_PRI.doc differ
diff --git a/doc/UG_19817_CNL113_312_RevG.pdf b/doc/UG_19817-CNL113312_EN_G_PDFV1R2.pdf
similarity index 99%
rename from doc/UG_19817_CNL113_312_RevG.pdf
rename to doc/UG_19817-CNL113312_EN_G_PDFV1R2.pdf
index 546a7e8cc439a5e58271f51895d06dd4235429e5..b82b0e7696caed67114adbeb7373a7446fa081cc 100644
Binary files a/doc/UG_19817_CNL113_312_RevG.pdf and b/doc/UG_19817-CNL113312_EN_G_PDFV1R2.pdf differ
diff --git a/src/HTTPmsg_MessageLen.ttcn b/src/HTTPmsg_MessageLen.ttcn
index 845ea225e50239bae3f925f54dbd31777d935de6..37fdfff015eb11b918552efcc41f2b4ddcbd8319 100644
--- a/src/HTTPmsg_MessageLen.ttcn
+++ b/src/HTTPmsg_MessageLen.ttcn
@@ -16,7 +16,7 @@
 //
 //  File:               HTTPmsg_MessageLen.ttcn
 //  Description:        HTTP Message length calculator
-//  Rev:                R8F
+//  Rev:                R8G
 //  Prodnr:             CNL 113 469
 
 module HTTPmsg_MessageLen{
diff --git a/src/HTTPmsg_MessageLen_Function.cc b/src/HTTPmsg_MessageLen_Function.cc
index 07d1c54f535ca122e53d96306c4cf60b8e1406d6..fe0eae2da81ae22f138083beaeac45b3f48af8e4 100644
--- a/src/HTTPmsg_MessageLen_Function.cc
+++ b/src/HTTPmsg_MessageLen_Function.cc
@@ -15,7 +15,7 @@
 //
 //  File:               HTTPmsg_MessageLen_Function.cc
 //  Description:        HTTP Message length calculator
-//  Rev:                R8F
+//  Rev:                R8G
 //  Prodnr:             CNL 113 469
 
 #include "HTTPmsg_PT.hh"
diff --git a/src/HTTPmsg_PT.cc b/src/HTTPmsg_PT.cc
index 411ade48f514533cab19aceb3be92e6049385add..3d273c65a0eca429e231ba09098ac439dede7eda 100644
--- a/src/HTTPmsg_PT.cc
+++ b/src/HTTPmsg_PT.cc
@@ -15,7 +15,7 @@
 //
 //  File:               HTTPmsg_PT.cc
 //  Description:        HTTP test port implementation
-//  Rev:                R8F
+//  Rev:                R8G
 //  Prodnr:             CNL 113 469
 
 
@@ -693,7 +693,8 @@ bool f_HTTP_decodeCommon( TTCN_Buffer* buffer, HTTPmsg__Types::HTTPMessage& msg,
             method_name[pos - cc_first] = '\0';
 
             char* stext = (char*)Malloc(strlen(cc_first));
-
+            stext[0] = '\0';
+	    
             TTCN_Logger::log(TTCN_DEBUG, "method_name: <%s>", method_name);
             if(strncasecmp(method_name, "HTTP/", 5) == 0)
             {
@@ -701,7 +702,7 @@ bool f_HTTP_decodeCommon( TTCN_Buffer* buffer, HTTPmsg__Types::HTTPMessage& msg,
                 isResponse = true;
 
                 if(sscanf(cc_first, "HTTP/%d.%d %d %[^\r]", &version__major, &version__minor,
-                          &statusCode, stext) != 4)
+                          &statusCode, stext) < 3)
                 {
                     decoding_params.isMessage = FALSE;
                     decoding_params.error = TRUE;
diff --git a/src/HTTPmsg_PT.hh b/src/HTTPmsg_PT.hh
index 46b2eddb355553c8a6ce41712955301c127d2231..86b79d6701795b5076cdc72cba2ab4c2bf10de78 100644
--- a/src/HTTPmsg_PT.hh
+++ b/src/HTTPmsg_PT.hh
@@ -15,7 +15,7 @@
 //
 //  File:               HTTPmsg_PT.hh
 //  Description:        HTTP test port header file
-//  Rev:                R8F
+//  Rev:                R8G
 //  Prodnr:             CNL 113 469
 
 
diff --git a/src/HTTPmsg_PortType.ttcn b/src/HTTPmsg_PortType.ttcn
index d2745e44afeedd39aad57e660188a425d7222302..3177270c0fc38d3d7eaacece5dcff9a53a97e1c6 100644
--- a/src/HTTPmsg_PortType.ttcn
+++ b/src/HTTPmsg_PortType.ttcn
@@ -15,7 +15,7 @@
 //
 //  File:               HTTPmsg_Types.ttcn
 //  Description:        HTTP port type definition
-//  Rev:                R8F
+//  Rev:                R8G
 //  Prodnr:             CNL 113 469
 
 
diff --git a/src/HTTPmsg_Types.ttcn b/src/HTTPmsg_Types.ttcn
index 102fee4ff47adcc45f54f915f8bf9eb0f8c2b16f..63ffa44d1f4caa63c1f483a7376fa978c4b49db2 100644
--- a/src/HTTPmsg_Types.ttcn
+++ b/src/HTTPmsg_Types.ttcn
@@ -15,7 +15,7 @@
 //
 //  File:               HTTPmsg_Types.ttcn
 //  Description:        HTTP Message and TCP connection handling ASP types
-//  Rev:                R8F
+//  Rev:                R8G
 //  Prodnr:             CNL 113 469