diff --git a/src/BeSimple/SoapCommon/Mime/Parser.php b/src/BeSimple/SoapCommon/Mime/Parser.php
index 5f98b72..48f4f4c 100644
--- a/src/BeSimple/SoapCommon/Mime/Parser.php
+++ b/src/BeSimple/SoapCommon/Mime/Parser.php
@@ -142,26 +142,30 @@ class Parser
      */
     private static function parseContentTypeHeader(PartHeader $part, $headerName, $headerValue)
     {
-        list($value, $remainder) = explode(';', $headerValue, 2);
-        $value = trim($value);
-        $part->setHeader($headerName, $value);
-        $remainder = trim($remainder);
-        while (strlen($remainder) > 0) {
-            if (!preg_match('/^([a-zA-Z0-9_-]+)=(.{1})/', $remainder, $matches)) {
-                break;
+        if (strpos($headerValue, ';')) {
+            list($value, $remainder) = explode(';', $headerValue, 2);
+            $value = trim($value);
+            $part->setHeader($headerName, $value);
+            $remainder = trim($remainder);
+            while (strlen($remainder) > 0) {
+                if (!preg_match('/^([a-zA-Z0-9_-]+)=(.{1})/', $remainder, $matches)) {
+                    break;
+                }
+                $name = $matches[1];
+                $delimiter = $matches[2];
+                $remainder = substr($remainder, strlen($name) + 1);
+                if (!preg_match('/([^;]+)(;)?(\s|$)?/', $remainder, $matches)) {
+                    break;
+                }
+                $value = rtrim($matches[1], ';');
+                if ($delimiter == "'" || $delimiter == '"') {
+                    $value = trim($value, $delimiter);
+                }
+                $part->setHeader($headerName, $name, $value);
+                $remainder = substr($remainder, strlen($matches[0]));
             }
-            $name = $matches[1];
-            $delimiter = $matches[2];
-            $remainder = substr($remainder, strlen($name)+1);
-            if (!preg_match('/([^;]+)(;)?(\s|$)?/', $remainder, $matches)) {
-                break;
-            }
-            $value = rtrim($matches[1], ';');
-            if ($delimiter == "'" || $delimiter == '"') {
-                $value = trim($value, $delimiter);
-            }
-            $part->setHeader($headerName, $name, $value);
-            $remainder = substr($remainder, strlen($matches[0]));
+        } else {
+            $part->setHeader($headerName, $headerValue);
         }
     }
 
diff --git a/src/BeSimple/SoapServer/SoapServer.php b/src/BeSimple/SoapServer/SoapServer.php
index 712e736..eb81f60 100644
--- a/src/BeSimple/SoapServer/SoapServer.php
+++ b/src/BeSimple/SoapServer/SoapServer.php
@@ -117,6 +117,20 @@ class SoapServer extends \SoapServer
         }
     }
 
+    public function handleWsdlRequest(SoapRequest $soapRequest)
+    {
+        ob_start();
+        parent::handle();
+        $nativeSoapServerResponse = ob_get_clean();
+
+        return SoapResponseFactory::create(
+            $nativeSoapServerResponse,
+            $soapRequest->getLocation(),
+            $soapRequest->getAction(),
+            $soapRequest->getVersion()
+        );
+    }
+
     /**
      * Runs the currently registered request filters on the request, calls the
      * necessary functions (through the parent's class handle()) and runs the