1.0.2.12

Fixed issue #76 (#77 )
#76
2026-01-14 06:13:35 +01:00 · 2018-01-16 20:46:43 +01:00 · 2018-01-16 20:44:59 +01:00 · 2018-01-11 19:38:58 +01:00 · 2018-01-10 16:33:32 +01:00 · 2017-12-20 20:51:51 +01:00
77 changed files with 1971 additions and 910 deletions
--- a/README.md
+++ b/README.md
@@ -3,9 +3,9 @@ A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) w

 [![Build status](https://ci.appveyor.com/api/projects/status/b3n6q3ygbww4lyls?svg=true)](https://ci.appveyor.com/project/StefH/wiremock-net)
 [![codecov](https://codecov.io/gh/WireMock-Net/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/WireMock-Net/WireMock.Net)
-[![Coverage Status](https://coveralls.io/repos/github/StefH/WireMock.Net/badge.svg?branch=master)](https://coveralls.io/github/StefH/WireMock.Net?branch=master)
-[![GitHub issues](https://img.shields.io/github/issues/StefH/WireMock.Net.svg)](https://github.com/StefH/WireMock.Net/issues)
-[![GitHub stars](https://img.shields.io/github/stars/StefH/WireMock.Net.svg)](https://github.com/StefH/WireMock.Net/stargazers)
+[![Coverage Status](https://coveralls.io/repos/github/WireMock-Net/WireMock.Net/badge.svg?branch=master)](https://coveralls.io/github/WireMock-Net/WireMock.Net?branch=master)
+[![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/issues)
+[![GitHub stars](https://img.shields.io/github/stars/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/stargazers)

 | Name | NuGet |
 | ---- | ----- |
@@ -28,7 +28,7 @@ To build you need:


 ## Stubbing
-A core feature of WireMock.Net is the ability to return canned/predefined HTTP responses for requests matching criteria, see [Wiki : Stubbing](https://github.com/StefH/WireMock.Net/wiki/Stubbing).
+A core feature of WireMock.Net is the ability to return canned/predefined HTTP responses for requests matching criteria, see [Wiki : Stubbing & Request Matching](https://github.com/WireMock-Net/WireMock.Net/wiki/Stubbing-and-Request-Matching).

 ## Using WireMock in UnitTest framework
 You can use your favorite test framework and use WireMock within your tests, see
--- a/Solution.sln
+++ b/Solution.sln
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2002
+VisualStudioVersion = 15.0.27130.2020
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EF242EDF-7133-4277-9A0C-18744DE08707}"
 EndProject
@@ -36,7 +36,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net
 		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {B6269AAC-170A-43D5-8B9A-579DED3D9A95}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.ConsoleApplication", "examples\WireMock.Net.ConsoleApplication\WireMock.Net.ConsoleApplication.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.NET452", "examples\WireMock.Net.ConsoleApplication\WireMock.Net.Console.NET452.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.WebApplication", "examples\WireMock.Net.WebApplication\WireMock.Net.WebApplication.csproj", "{049539C1-7A66-4559-AD7A-B1C73B97CBB0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -80,6 +82,10 @@ Global
 		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.Build.0 = Release|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -94,6 +100,7 @@ Global
 		{10E16614-61CA-48D8-8BDD-664C13913DED} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{668F689E-57B4-422E-8846-C0FF643CA999} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{668F689E-57B4-422E-8846-C0FF643CA268} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BF428BCC-C837-433B-87D2-15C7014B73E9}
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,7 +21,6 @@ environment:
 before_build:
 - dotnet restore .\src\WireMock.Net\WireMock.Net.csproj
 - dotnet restore .\src\WireMock.Net.Standalone\WireMock.Net.Standalone.csproj
- nuget restore .\examples\WireMock.Net.ConsoleApplication\WireMock.Net.ConsoleApplication.csproj -PackagesDirectory packages

 build_script:
 # build WireMock.Net
@@ -39,6 +38,6 @@ test_script:
  - nuget.exe install coveralls.net -ExcludeVersion
  - pip install codecov

-  - cmd: '"OpenCover\tools\OpenCover.Console.exe" -register:user -target:dotnet.exe -targetargs:"test test\WireMock.Net.Tests\WireMock.Net.Tests.csproj --no-build" -returntargetcode -filter:"+[WireMock.Net]* -[WireMock.Net.Tests*]*" -output:coverage.xml -oldstyle -searchdirs:".\test\WireMock.Net.Tests\bin\%CONFIGURATION%\net452"'
+  - cmd: '"OpenCover\tools\OpenCover.Console.exe" -target:dotnet.exe -targetargs:"test test\WireMock.Net.Tests\WireMock.Net.Tests.csproj --no-build" -output:coverage.xml -returntargetcode -register:user -filter:"+[WireMock.Net]* -[WireMock.Net.Tests*]*" -nodefaultfilters -returntargetcode -oldstyle -searchdirs:".\test\WireMock.Net.Tests\bin\%CONFIGURATION%\net452"'
  - codecov -f "coverage.xml"
  - coveralls.net\tools\csmacnz.Coveralls.exe --opencover -i .\coverage.xml
--- a/examples/WireMock.Net.Client/WireMock.Net.Client.csproj
+++ b/examples/WireMock.Net.Client/WireMock.Net.Client.csproj
@@ -9,7 +9,7 @@

  <ItemGroup>
    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="RestEase" Version="1.4.3" />
+    <PackageReference Include="RestEase" Version="1.4.4" />
  </ItemGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj
@@ -18,9 +18,6 @@
    <Content Include="__admin\mappings\11111110-a633-40e8-a244-5cb80bc0ab66.json">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
-    <Content Include="__admin\mappings\826aff7c-6208-4a3c-923d-575248907db4.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
  </ItemGroup>

  <ItemGroup>
@@ -28,4 +25,13 @@
    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
  </ItemGroup>

+  <ItemGroup>
+    <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
--- a/examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/11111110-a633-40e8-a244-5cb80bc0ab66.json
+++ b/examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/11111110-a633-40e8-a244-5cb80bc0ab66.json
@@ -14,8 +14,9 @@
    },
    "Response": {
        "BodyAsJson": { "body": "static mapping" },
-        "Headers": {
-            "Content-Type": "application/json"
-        }
+      "Headers": {
+        "Content-Type": "application/json",
+        "Test-X": [ "test 1", "test 2" ]
+      }
    }
 }
--- a/examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/791a3f31-6946-4ce7-8e6f-0237c7443275.json
+++ b/examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/791a3f31-6946-4ce7-8e6f-0237c7443275.json
@@ -0,0 +1,36 @@
+{
+  "Guid": "791a3f31-6946-4ce7-8e6f-0237c7443275",
+  "Title": "",
+  "Priority": 0,
+  "Request": {
+    "Path": {
+      "Matchers": [
+        {
+          "Name": "WildcardMatcher",
+          "Pattern": "/proxy-google-test-post"
+        }
+      ]
+    },
+    "Methods": [
+      "post"
+    ],
+    "Body": {}
+  },
+  "Response": {
+    "StatusCode": 404,
+    "Body": "<!DOCTYPE html>\n<html lang=en>\n  <meta charset=utf-8>\n  <meta name=viewport content=\"initial-scale=1, minimum-scale=1, width=device-width\">\n  <title>Error 404 (Not Found)!!1</title>\n  <style>\n    *{margin:0;padding:0}html,code{font:15px/22px arial,sans-serif}html{background:#fff;color:#222;padding:15px}body{margin:7% auto 0;max-width:390px;min-height:180px;padding:30px 0 15px}* > body{background:url(//www.google.com/images/errors/robot.png) 100% 5px no-repeat;padding-right:205px}p{margin:11px 0 22px;overflow:hidden}ins{color:#777;text-decoration:none}a img{border:0}@media screen and (max-width:772px){body{background:none;margin-top:0;max-width:none;padding-right:0}}#logo{background:url(//www.google.com/images/branding/googlelogo/1x/googlelogo_color_150x54dp.png) no-repeat;margin-left:-5px}@media only screen and (min-resolution:192dpi){#logo{background:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) no-repeat 0% 0%/100% 100%;-moz-border-image:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) 0}}@media only screen and (-webkit-min-device-pixel-ratio:2){#logo{background:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) no-repeat;-webkit-background-size:100% 100%}}#logo{display:inline-block;height:54px;width:150px}\n  </style>\n  <a href=//www.google.com/><span id=logo aria-label=Google></span></a>\n  <p><b>404.</b> <ins>That’s an error.</ins>\n  <p>The requested URL <code>/proxy-google-test-post</code> was not found on this server.  <ins>That’s all we know.</ins>\n",
+    "BodyAsBytes": "PCFET0NUWVBFIGh0bWw+CjxodG1sIGxhbmc9ZW4+CiAgPG1ldGEgY2hhcnNldD11dGYtOD4KICA8bWV0YSBuYW1lPXZpZXdwb3J0IGNvbnRlbnQ9ImluaXRpYWwtc2NhbGU9MSwgbWluaW11bS1zY2FsZT0xLCB3aWR0aD1kZXZpY2Utd2lkdGgiPgogIDx0aXRsZT5FcnJvciA0MDQgKE5vdCBGb3VuZCkhITE8L3RpdGxlPgogIDxzdHlsZT4KICAgICp7bWFyZ2luOjA7cGFkZGluZzowfWh0bWwsY29kZXtmb250OjE1cHgvMjJweCBhcmlhbCxzYW5zLXNlcmlmfWh0bWx7YmFja2dyb3VuZDojZmZmO2NvbG9yOiMyMjI7cGFkZGluZzoxNXB4fWJvZHl7bWFyZ2luOjclIGF1dG8gMDttYXgtd2lkdGg6MzkwcHg7bWluLWhlaWdodDoxODBweDtwYWRkaW5nOjMwcHggMCAxNXB4fSogPiBib2R5e2JhY2tncm91bmQ6dXJsKC8vd3d3Lmdvb2dsZS5jb20vaW1hZ2VzL2Vycm9ycy9yb2JvdC5wbmcpIDEwMCUgNXB4IG5vLXJlcGVhdDtwYWRkaW5nLXJpZ2h0OjIwNXB4fXB7bWFyZ2luOjExcHggMCAyMnB4O292ZXJmbG93OmhpZGRlbn1pbnN7Y29sb3I6Izc3Nzt0ZXh0LWRlY29yYXRpb246bm9uZX1hIGltZ3tib3JkZXI6MH1AbWVkaWEgc2NyZWVuIGFuZCAobWF4LXdpZHRoOjc3MnB4KXtib2R5e2JhY2tncm91bmQ6bm9uZTttYXJnaW4tdG9wOjA7bWF4LXdpZHRoOm5vbmU7cGFkZGluZy1yaWdodDowfX0jbG9nb3tiYWNrZ3JvdW5kOnVybCgvL3d3dy5nb29nbGUuY29tL2ltYWdlcy9icmFuZGluZy9nb29nbGVsb2dvLzF4L2dvb2dsZWxvZ29fY29sb3JfMTUweDU0ZHAucG5nKSBuby1yZXBlYXQ7bWFyZ2luLWxlZnQ6LTVweH1AbWVkaWEgb25seSBzY3JlZW4gYW5kIChtaW4tcmVzb2x1dGlvbjoxOTJkcGkpeyNsb2dve2JhY2tncm91bmQ6dXJsKC8vd3d3Lmdvb2dsZS5jb20vaW1hZ2VzL2JyYW5kaW5nL2dvb2dsZWxvZ28vMngvZ29vZ2xlbG9nb19jb2xvcl8xNTB4NTRkcC5wbmcpIG5vLXJlcGVhdCAwJSAwJS8xMDAlIDEwMCU7LW1vei1ib3JkZXItaW1hZ2U6dXJsKC8vd3d3Lmdvb2dsZS5jb20vaW1hZ2VzL2JyYW5kaW5nL2dvb2dsZWxvZ28vMngvZ29vZ2xlbG9nb19jb2xvcl8xNTB4NTRkcC5wbmcpIDB9fUBtZWRpYSBvbmx5IHNjcmVlbiBhbmQgKC13ZWJraXQtbWluLWRldmljZS1waXhlbC1yYXRpbzoyKXsjbG9nb3tiYWNrZ3JvdW5kOnVybCgvL3d3dy5nb29nbGUuY29tL2ltYWdlcy9icmFuZGluZy9nb29nbGVsb2dvLzJ4L2dvb2dsZWxvZ29fY29sb3JfMTUweDU0ZHAucG5nKSBuby1yZXBlYXQ7LXdlYmtpdC1iYWNrZ3JvdW5kLXNpemU6MTAwJSAxMDAlfX0jbG9nb3tkaXNwbGF5OmlubGluZS1ibG9jaztoZWlnaHQ6NTRweDt3aWR0aDoxNTBweH0KICA8L3N0eWxlPgogIDxhIGhyZWY9Ly93d3cuZ29vZ2xlLmNvbS8+PHNwYW4gaWQ9bG9nbyBhcmlhLWxhYmVsPUdvb2dsZT48L3NwYW4+PC9hPgogIDxwPjxiPjQwNC48L2I+IDxpbnM+VGhhdOKAmXMgYW4gZXJyb3IuPC9pbnM+CiAgPHA+VGhlIHJlcXVlc3RlZCBVUkwgPGNvZGU+L3Byb3h5LWdvb2dsZS10ZXN0LXBvc3Q8L2NvZGU+IHdhcyBub3QgZm91bmQgb24gdGhpcyBzZXJ2ZXIuICA8aW5zPlRoYXTigJlzIGFsbCB3ZSBrbm93LjwvaW5zPgo=",
+    "BodyEncoding": {
+      "CodePage": 65001,
+      "EncodingName": "Unicode (UTF-8)",
+      "WebName": "utf-8"
+    },
+    "UseTransformer": false,
+    "Headers": {
+      "Date": "Wed, 25 Oct 2017 18:57:40 GMT",
+      "Alt-Svc": "quic=\":443\"; ma=2592000; v=\"39,38,37,35\"",
+      "Referrer-Policy": "no-referrer",
+      "Connection": "close"
+    }
+  }
+}
--- a/examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/826aff7c-6208-4a3c-923d-575248907db4.json
+++ b/examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/826aff7c-6208-4a3c-923d-575248907db4.json
--- a/examples/WireMock.Net.Console.Record.NETCoreApp/Program.cs
+++ b/examples/WireMock.Net.Console.Record.NETCoreApp/Program.cs
@@ -10,13 +10,15 @@ namespace WireMock.Net.Console.Record.NETCoreApp
        {
            var server = FluentMockServer.Start(new FluentMockServerSettings
            {
-                Urls = new[] { "http://localhost:9095/", "https://localhost:9096/" },
+                Urls = new[] { "http://localhost:9091/", "https://localhost:9443/" },
                StartAdminInterface = true,
+                ReadStaticMappings = false,
                ProxyAndRecordSettings = new ProxyAndRecordSettings
                {
-                    Url = "https://www.msn.com",
+                    Url = "https://www.google.com",
                    //X509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
-                    SaveMapping = true
+                    SaveMapping = true,
+                    SaveMappingToFile = false
                }
            });

--- a/examples/WireMock.Net.Console.Record.NETCoreApp/WireMock.Net.Console.Record.NETCoreApp.csproj
+++ b/examples/WireMock.Net.Console.Record.NETCoreApp/WireMock.Net.Console.Record.NETCoreApp.csproj
@@ -15,4 +15,8 @@
    <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
  </ItemGroup>

+  <ItemGroup>
+    <Folder Include="__admin\mappings\" />
+  </ItemGroup>
+
 </Project>
--- a/examples/WireMock.Net.Console.Record.NETCoreApp/__admin/mappings/ab38efae-4e4d-4f20-8afe-635533ec2535.json
+++ b/examples/WireMock.Net.Console.Record.NETCoreApp/__admin/mappings/ab38efae-4e4d-4f20-8afe-635533ec2535.json
--- a/examples/WireMock.Net.ConsoleApplication/MainApp.cs
+++ b/examples/WireMock.Net.ConsoleApplication/MainApp.cs
@@ -20,7 +20,11 @@ namespace WireMock.Net.ConsoleApplication
            {
                Urls = new[] { url1, url2, url3 },
                StartAdminInterface = true,
-                ReadStaticMappings = false,
+                ReadStaticMappings = true,
+                //ProxyAndRecordSettings = new ProxyAndRecordSettings
+                //{
+                //    SaveMapping = true
+                //},
                PreWireMockMiddlewareInit = app => { System.Console.WriteLine($"PreWireMockMiddlewareInit : {app.GetType()}"); },
                PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); }
            });
@@ -28,7 +32,47 @@ namespace WireMock.Net.ConsoleApplication

            server.SetBasicAuthentication("a", "b");

-            // server.AllowPartialMapping();
+            server.AllowPartialMapping();
+
+            // .WithHeader("Stef", "Stef")
+            //server
+            //    .Given(Request.Create().WithPath("*"))
+            //    .RespondWith(Response.Create()
+            //    .WithProxy("http://restcountries.eu"));
+
+            server
+                .Given(Request
+                    .Create()
+                    .WithPath(new WildcardMatcher("/navision/OData/Company('My Company')/School*", true))
+                    .WithParam("$filter", "(substringof(Code, 'WA')")
+                    .UsingGet())
+                .RespondWith(Response.Create()
+                    .WithBody(@"{ ""result"": ""odata""}"));
+
+            server
+                .Given(Request.Create().WithPath("/headers", "/headers_test").UsingPost().WithHeader("Content-Type", "application/json*"))
+                .RespondWith(Response.Create()
+                    .WithStatusCode(201)
+                    .WithHeader("MyHeader", "application/json", "application/json2")
+                    .WithBody(@"{ ""result"": ""data posted with 201""}"));
+
+            server
+                .Given(Request.Create().WithPath("/file").UsingGet())
+                .RespondWith(Response.Create()
+                    .WithBodyFromFile(@"c:\temp\x.json", false)
+                );
+
+            server
+                .Given(Request.Create().WithPath("/filecache").UsingGet())
+                .RespondWith(Response.Create()
+                    .WithBodyFromFile(@"c:\temp\x.json")
+                );
+
+            server
+                .Given(Request.Create().WithPath("/file_rel").UsingGet())
+                .RespondWith(Response.Create()
+                    .WithBodyFromFile("Program.cs", false)
+                );

            server
                .Given(Request.Create().WithHeader("ProxyThis", "true")
@@ -74,13 +118,6 @@ namespace WireMock.Net.ConsoleApplication
                    .WithHeader("Content-Type", "application/json")
                    .WithBody(@"{ ""result"": ""data posted with FUNC 201""}"));

-            server
-                .Given(Request.Create().WithPath("/data", "/ax").UsingPost().WithHeader("Content-Type", "application/json*"))
-                .RespondWith(Response.Create()
-                    .WithStatusCode(201)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""data posted with 201""}"));
-
            server
                .Given(Request.Create().WithPath("/json").UsingPost().WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]")))
                .RespondWith(Response.Create()
--- a/examples/WireMock.Net.ConsoleApplication/WireMock.Net.ConsoleApplication.csproj
+++ b/examples/WireMock.Net.ConsoleApplication/WireMock.Net.ConsoleApplication.csproj
--- a/examples/WireMock.Net.WebApplication/App.cs
+++ b/examples/WireMock.Net.WebApplication/App.cs
@@ -0,0 +1,22 @@
+using Microsoft.Extensions.Logging;
+
+namespace WireMock.Net.WebApplication
+{
+    public class App
+    {
+        private readonly IWireMockService _service;
+        private readonly ILogger _logger;
+        
+        public App(IWireMockService service, ILogger logger)
+        {
+            _service = service;
+            _logger = logger;
+        }
+
+        public void Run()
+        {
+            _logger.LogInformation("WireMock.Net App running");
+            _service.Run();
+        }
+    }
+}
--- a/examples/WireMock.Net.WebApplication/IWireMockService.cs
+++ b/examples/WireMock.Net.WebApplication/IWireMockService.cs
@@ -0,0 +1,7 @@
+namespace WireMock.Net.WebApplication
+{
+    public interface IWireMockService
+    {
+        void Run();
+    }
+}
--- a/examples/WireMock.Net.WebApplication/Program.cs
+++ b/examples/WireMock.Net.WebApplication/Program.cs
@@ -0,0 +1,57 @@
+using System;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using WireMock.Settings;
+
+namespace WireMock.Net.WebApplication
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Create service collection
+            var serviceCollection = new ServiceCollection();
+            ConfigureServices(serviceCollection);
+
+            // Create service provider
+            var serviceProvider = serviceCollection.BuildServiceProvider();
+
+            // Run app
+            serviceProvider.GetService<App>().Run();
+        }
+
+        private static void ConfigureServices(IServiceCollection serviceCollection)
+        {
+            // Build configuration
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(AppContext.BaseDirectory)
+                .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+                .AddEnvironmentVariables() // <-- this is needed to to override settings via the Azure Portal App Settings
+                .Build();
+
+            // Add LoggerFactory
+            var factory = new LoggerFactory();
+            serviceCollection.AddSingleton(factory
+                .AddConsole(configuration.GetSection("Logging"))
+                .AddDebug()
+                .AddAzureWebAppDiagnostics()
+            );
+
+            serviceCollection.AddSingleton(factory.CreateLogger("WireMock.Net Logger"));
+
+            // Add access to generic IConfigurationRoot
+            serviceCollection.AddSingleton(configuration);
+
+            // Add access to IFluentMockServerSettings
+            var settings = configuration.GetSection("FluentMockServerSettings").Get<FluentMockServerSettings>();
+            serviceCollection.AddSingleton<IFluentMockServerSettings>(settings);
+
+            // Add services
+            serviceCollection.AddTransient<IWireMockService, WireMockService>();
+
+            // Add app
+            serviceCollection.AddTransient<App>();
+        }
+    }
+}
--- a/examples/WireMock.Net.WebApplication/Properties/launchSettings.json
+++ b/examples/WireMock.Net.WebApplication/Properties/launchSettings.json
@@ -0,0 +1,28 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:56513/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchUrl": "__admin/settings",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "WireMock.Net.WebApplication": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "__admin/settings",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:56514/"
+    }
+  }
+}
--- a/examples/WireMock.Net.WebApplication/WireMock.Net.WebApplication.csproj
+++ b/examples/WireMock.Net.WebApplication/WireMock.Net.WebApplication.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj" />
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+</Project>
--- a/examples/WireMock.Net.WebApplication/WireMockService.cs
+++ b/examples/WireMock.Net.WebApplication/WireMockService.cs
@@ -0,0 +1,37 @@
+using System.Threading;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using WireMock.Net.StandAlone;
+using WireMock.Settings;
+
+namespace WireMock.Net.WebApplication
+{
+    public class WireMockService : IWireMockService
+    {
+        private static int sleepTime = 30000;
+
+        private readonly ILogger _logger;
+        private readonly IFluentMockServerSettings _settings;
+
+        public WireMockService(ILogger logger, IFluentMockServerSettings settings)
+        {
+            _logger = logger;
+            _settings = settings;
+        }
+
+        public void Run()
+        {
+            _logger.LogInformation("WireMock.Net server starting");
+
+            StandAloneApp.Start(_settings);
+
+            _logger.LogInformation($"WireMock.Net server settings {JsonConvert.SerializeObject(_settings)}");
+
+            while (true)
+            {
+                _logger.LogInformation("WireMock.Net server running");
+                Thread.Sleep(sleepTime);
+            }
+        }
+    }
+}
--- a/examples/WireMock.Net.WebApplication/appsettings.json
+++ b/examples/WireMock.Net.WebApplication/appsettings.json
@@ -0,0 +1,20 @@
+{
+  "Logging": {
+    "IncludeScopes": false,
+    "Debug": {
+      "LogLevel": {
+        "Default": "Debug"
+      }
+    },
+    "Console": {
+      "LogLevel": {
+        "Default": "Debug"
+      }
+    }
+  },
+  "FluentMockServerSettings": {
+    "AdminUsername": "a",
+    "AdminPassword": "a",
+    "StartAdminInterface": true
+  }
+}
--- a/src/WireMock.Net.StandAlone/StandAloneApp.cs
+++ b/src/WireMock.Net.StandAlone/StandAloneApp.cs
@@ -18,7 +18,7 @@ namespace WireMock.Net.StandAlone
        /// </summary>
        /// <param name="settings">The FluentMockServerSettings</param>
        [PublicAPI]
-        public static FluentMockServer Start([NotNull] FluentMockServerSettings settings)
+        public static FluentMockServer Start([NotNull] IFluentMockServerSettings settings)
        {
            Check.NotNull(settings, nameof(settings));

@@ -66,6 +66,7 @@ namespace WireMock.Net.StandAlone
                {
                    Url = proxyURL,
                    SaveMapping = parser.GetBoolValue("SaveMapping"),
+                    SaveMappingToFile = parser.GetBoolValue("SaveMappingToFile"),
                    X509Certificate2ThumbprintOrSubjectName = parser.GetStringValue("X509Certificate2ThumbprintOrSubjectName")
                };
            }
--- a/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj
+++ b/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
    <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
-    <Version>1.0.2.5</Version>
+    <Version>1.0.2.12</Version>
    <Authors>Stef Heyenrath</Authors>
    <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
--- a/src/WireMock.Net/Admin/Mappings/ResponseModel.cs
+++ b/src/WireMock.Net/Admin/Mappings/ResponseModel.cs
@@ -10,9 +10,6 @@ namespace WireMock.Admin.Mappings
        /// <summary>
        /// Gets or sets the HTTP status.
        /// </summary>
-        /// <value>
-        /// The HTTP status.
-        /// </value>
        public int? StatusCode { get; set; }

        /// <summary>
@@ -23,79 +20,61 @@ namespace WireMock.Admin.Mappings
        /// <summary>
        /// Gets or sets the body.
        /// </summary>
-        /// <value>
-        /// The body.
-        /// </value>
        public string Body { get; set; }

        /// <summary>
        /// Gets or sets the body.
        /// </summary>
-        /// <value>
-        /// The body.
-        /// </value>
        public string BodyFromBase64 { get; set; }

        /// <summary>
        /// Gets or sets the body (as JSON object).
        /// </summary>
-        /// <value>
-        /// The body.
-        /// </value>
        public object BodyAsJson { get; set; }

        /// <summary>
        /// Gets or sets the body (as bytearray).
        /// </summary>
-        /// <value>
-        /// The body.
-        /// </value>
        public byte[] BodyAsBytes { get; set; }

+        /// <summary>
+        /// Gets or sets the body as a file.
+        /// </summary>
+        public string BodyAsFile { get; set; }
+
+        /// <summary>
+        /// Is the body as file cached?
+        /// </summary>
+        public bool? BodyAsFileIsCached { get; set; }
+
        /// <summary>
        /// Gets or sets the body encoding.
        /// </summary>
-        /// <value>
-        /// The body encoding.
-        /// </value>
        public EncodingModel BodyEncoding { get; set; }

        /// <summary>
        /// Gets or sets a value indicating whether [use transformer].
        /// </summary>
-        /// <value>
-        ///   <c>true</c> if [use transformer]; otherwise, <c>false</c>.
-        /// </value>
        public bool UseTransformer { get; set; }

        /// <summary>
        /// Gets or sets the headers.
        /// </summary>
-        /// <value>
-        /// The headers.
-        /// </value>
-        public IDictionary<string, string> Headers { get; set; }
+        public IDictionary<string, object> Headers { get; set; }

        /// <summary>
        /// Gets or sets the Headers (Raw).
        /// </summary>
-        /// <value>
-        /// The Headers (Raw).
-        /// </value>
        public string HeadersRaw { get; set; }

        /// <summary>
        /// Gets or sets the delay in milliseconds.
        /// </summary>
-        /// <value>
-        /// The delay in milliseconds.
-        /// </value>
        public int? Delay { get; set; }

        /// <summary>
        /// Gets or sets the Proxy URL.
        /// </summary>
-        /// <value>ProxyUrl</value>
        public string ProxyUrl { get; set; }

        /// <summary>
--- a/src/WireMock.Net/Admin/Requests/LogRequestModel.cs
+++ b/src/WireMock.Net/Admin/Requests/LogRequestModel.cs
@@ -23,17 +23,11 @@ namespace WireMock.Admin.Requests
        /// <summary>
        /// Gets or sets the Path.
        /// </summary>
-        /// <value>
-        /// The Path.
-        /// </value>
        public string Path { get; set; }

        /// <summary>
        /// Gets or sets the absolete URL.
        /// </summary>
-        /// <value>
-        /// The absolute URL.
-        /// </value>
        public string AbsoluteUrl { get; set; }

        /// <summary>
@@ -44,41 +38,26 @@ namespace WireMock.Admin.Requests
        /// <summary>
        /// Gets or sets the method.
        /// </summary>
-        /// <value>
-        /// The method.
-        /// </value>
        public string Method { get; set; }

        /// <summary>
        /// Gets or sets the Headers.
        /// </summary>
-        /// <value>
-        /// The Headers.
-        /// </value>
-        public IDictionary<string, string> Headers { get; set; }
+        public IDictionary<string, WireMockList<string>> Headers { get; set; }

        /// <summary>
        /// Gets or sets the Cookies.
        /// </summary>
-        /// <value>
-        /// The Cookies.
-        /// </value>
        public IDictionary<string, string> Cookies { get; set; }

        /// <summary>
        /// Gets or sets the body.
        /// </summary>
-        /// <value>
-        /// The body.
-        /// </value>
        public string Body { get; set; }

        /// <summary>
        /// Gets or sets the body encoding.
        /// </summary>
-        /// <value>
-        /// The body encoding.
-        /// </value>
        public EncodingModel BodyEncoding { get; set; }
    }
 }
--- a/src/WireMock.Net/Admin/Requests/LogResponseModel.cs
+++ b/src/WireMock.Net/Admin/Requests/LogResponseModel.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using WireMock.Admin.Mappings;
+using WireMock.Util;

 namespace WireMock.Admin.Requests
 {
@@ -16,7 +17,7 @@ namespace WireMock.Admin.Requests
        /// <summary>
        /// Gets the headers.
        /// </summary>
-        public IDictionary<string, string> Headers { get; set; }
+        public IDictionary<string, WireMockList<string>> Headers { get; set; }

        /// <summary>
        /// Gets or sets the body destination (SameAsSource, String or Bytes).
@@ -29,10 +30,20 @@ namespace WireMock.Admin.Requests
        public string Body { get; set; }

        /// <summary>
-        /// Gets or sets the body.
+        /// Gets or sets the body as bytes.
        /// </summary>
        public byte[] BodyAsBytes { get; set; }

+        /// <summary>
+        /// Gets or sets the body as file.
+        /// </summary>
+        public string BodyAsFile { get; set; }
+
+        /// <summary>
+        /// Is the body as file cached?
+        /// </summary>
+        public bool? BodyAsFileIsCached { get; set; }
+
        /// <summary>
        /// Gets or sets the original body.
        /// </summary>
--- a/src/WireMock.Net/Client/IFluentMockServerAdmin.cs
+++ b/src/WireMock.Net/Client/IFluentMockServerAdmin.cs
@@ -55,6 +55,7 @@ namespace WireMock.Client
        /// </summary>
        /// <param name="mapping">MappingModel</param>
        [Post("__admin/mappings")]
+        [Header("Content-Type", "application/json")]
        Task<string> PostMappingAsync([Body] MappingModel mapping);

        /// <summary>
@@ -103,7 +104,7 @@ namespace WireMock.Client
        /// </summary>
        /// <returns>LogRequestModels</returns>
        [Get("__admin/requests")]
-        Task<IList<LogRequestModel>> GetRequestsAsync();
+        Task<IList<LogEntryModel>> GetRequestsAsync();

        /// <summary>
        /// Delete all requests.
@@ -123,7 +124,7 @@ namespace WireMock.Client
        /// <param name="guid">The Guid</param>
        /// <returns>MappingModel</returns>
        [Get("__admin/requests/{guid}")]
-        Task<LogRequestModel> GetRequestAsync([Path] Guid guid);
+        Task<LogEntryModel> GetRequestAsync([Path] Guid guid);

        /// <summary>
        /// Delete a request based on the guid
@@ -137,7 +138,8 @@ namespace WireMock.Client
        /// </summary>
        /// <param name="model">The RequestModel</param>
        [Post("__admin/requests/find")]
-        Task<IList<LogRequestModel>> FindRequestsAsync([Body] RequestModel model);
+        [Header("Content-Type", "application/json")]
+        Task<IList<LogEntryModel>> FindRequestsAsync([Body] RequestModel model);

        /// <summary>
        /// Get all scenarios
--- a/src/WireMock.Net/DynamicResponseProvider.cs
+++ b/src/WireMock.Net/DynamicResponseProvider.cs
@@ -42,10 +42,10 @@ namespace WireMock

    internal class ProxyAsyncResponseProvider : IResponseProvider
    {
-        private readonly Func<RequestMessage, ProxyAndRecordSettings, Task<ResponseMessage>> _responseMessageFunc;
-        private readonly ProxyAndRecordSettings _settings;
+        private readonly Func<RequestMessage, IProxyAndRecordSettings, Task<ResponseMessage>> _responseMessageFunc;
+        private readonly IProxyAndRecordSettings _settings;

-        public ProxyAsyncResponseProvider([NotNull] Func<RequestMessage, ProxyAndRecordSettings, Task<ResponseMessage>> responseMessageFunc, [NotNull] ProxyAndRecordSettings settings)
+        public ProxyAsyncResponseProvider([NotNull] Func<RequestMessage, IProxyAndRecordSettings, Task<ResponseMessage>> responseMessageFunc, [NotNull] IProxyAndRecordSettings settings)
        {
            Check.NotNull(responseMessageFunc, nameof(responseMessageFunc));
            Check.NotNull(settings, nameof(settings));
--- a/src/WireMock.Net/Http/HttpClientHelper.cs
+++ b/src/WireMock.Net/Http/HttpClientHelper.cs
@@ -1,19 +1,25 @@
 using System;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using WireMock.Validation;

 namespace WireMock.Http
 {
    internal static class HttpClientHelper
    {
-        private static HttpClient CreateHttpClient(string clientX509Certificate2ThumbprintOrSubjectName = null)
+        public static HttpClient CreateHttpClient(string clientX509Certificate2ThumbprintOrSubjectName = null)
        {
-            if (!string.IsNullOrEmpty(clientX509Certificate2ThumbprintOrSubjectName))
+            HttpClientHandler handler;
+
+            if (string.IsNullOrEmpty(clientX509Certificate2ThumbprintOrSubjectName))
+            {
+                handler = new HttpClientHandler();
+            }
+            else
            {
 #if NETSTANDARD || NET46
-                var handler = new HttpClientHandler
+                handler = new HttpClientHandler
                {
                    ClientCertificateOptions = ClientCertificateOption.Manual,
                    SslProtocols = System.Security.Authentication.SslProtocols.Tls12 | System.Security.Authentication.SslProtocols.Tls11 | System.Security.Authentication.SslProtocols.Tls,
@@ -23,46 +29,60 @@ namespace WireMock.Http
                var x509Certificate2 = CertificateUtil.GetCertificate(clientX509Certificate2ThumbprintOrSubjectName);
                handler.ClientCertificates.Add(x509Certificate2);
 #else
-                var handler = new WebRequestHandler
+
+                var webRequestHandler = new WebRequestHandler
                {
                    ClientCertificateOptions = ClientCertificateOption.Manual,
                    ServerCertificateValidationCallback = (sender, certificate, chain, errors) => true,
-                    AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
+                    AutomaticDecompression = System.Net.DecompressionMethods.GZip | System.Net.DecompressionMethods.Deflate
                };

                var x509Certificate2 = CertificateUtil.GetCertificate(clientX509Certificate2ThumbprintOrSubjectName);
-                handler.ClientCertificates.Add(x509Certificate2);
-                return new HttpClient(handler);
+                webRequestHandler.ClientCertificates.Add(x509Certificate2);
+                handler = webRequestHandler;
 #endif
            }

-            return new HttpClient();
+            // For proxy we shouldn't follow auto redirects
+            handler.AllowAutoRedirect = false;
+
+            // If UseCookies enabled, httpClient ignores Cookie header
+            handler.UseCookies = false;
+
+            return new HttpClient(handler);
        }

-        public static async Task<ResponseMessage> SendAsync(RequestMessage requestMessage, string url, string clientX509Certificate2ThumbprintOrSubjectName = null)
+        public static async Task<ResponseMessage> SendAsync(HttpClient client, RequestMessage requestMessage, string url)
        {
-            var client = CreateHttpClient(clientX509Certificate2ThumbprintOrSubjectName);
+            Check.NotNull(client, nameof(client));
+
+            var originalUri = new Uri(requestMessage.Url);
+            var requiredUri = new Uri(url);

            var httpRequestMessage = new HttpRequestMessage(new HttpMethod(requestMessage.Method), url);

-            // Overwrite the host header
-            httpRequestMessage.Headers.Host = new Uri(url).Authority;
-
-            // Set headers if present
-            if (requestMessage.Headers != null)
-            {
-                foreach (var headerName in requestMessage.Headers.Keys.Where(k => k.ToUpper() != "HOST"))
-                {
-                    httpRequestMessage.Headers.TryAddWithoutValidation(headerName, new[] { requestMessage.Headers[headerName] });
-                }
-            }
-
            // Set Body if present
            if (requestMessage.BodyAsBytes != null && requestMessage.BodyAsBytes.Length > 0)
            {
                httpRequestMessage.Content = new ByteArrayContent(requestMessage.BodyAsBytes);
            }

+            // Overwrite the host header
+            httpRequestMessage.Headers.Host = requiredUri.Authority;
+
+            // Set headers if present
+            if (requestMessage.Headers != null)
+            {
+                foreach (var header in requestMessage.Headers.Where(header => !string.Equals(header.Key, "HOST", StringComparison.OrdinalIgnoreCase)))
+                {
+                    // Try to add to request headers. If failed - try to add to content headers
+                    if (!httpRequestMessage.Headers.TryAddWithoutValidation(header.Key, header.Value))
+                    {
+                        httpRequestMessage.Content?.Headers.TryAddWithoutValidation(header.Key, header.Value);
+                    }
+                }
+            }
+
            // Call the URL
            var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead);

@@ -75,9 +95,24 @@ namespace WireMock.Http
                Body = await httpResponseMessage.Content.ReadAsStringAsync()
            };

-            foreach (var header in httpResponseMessage.Headers)
+            // Set both content and response headers, replacing URLs in values
+            var headers = httpResponseMessage.Content?.Headers.Union(httpResponseMessage.Headers);
+
+            foreach (var header in headers)
            {
-                responseMessage.AddHeader(header.Key, header.Value.FirstOrDefault());
+                // if Location header contains absolute redirect URL, and base URL is one that we proxy to,
+                // we need to replace it to original one.
+                if (string.Equals(header.Key, "Location", StringComparison.OrdinalIgnoreCase)
+                    && Uri.TryCreate(header.Value.First(), UriKind.Absolute, out Uri absoluteLocationUri)
+                    && string.Equals(absoluteLocationUri.Host, requiredUri.Host, StringComparison.OrdinalIgnoreCase))
+                {
+                    var replacedLocationUri = new Uri(originalUri, absoluteLocationUri.PathAndQuery);
+                    responseMessage.AddHeader(header.Key, replacedLocationUri.ToString());
+                }
+                else
+                {
+                    responseMessage.AddHeader(header.Key, header.Value.ToArray());
+                }
            }

            return responseMessage;
--- a/src/WireMock.Net/Mapping.cs
+++ b/src/WireMock.Net/Mapping.cs
@@ -13,25 +13,16 @@ namespace WireMock
        /// <summary>
        /// Gets the unique identifier.
        /// </summary>
-        /// <value>
-        /// The unique identifier.
-        /// </value>
        public Guid Guid { get; }

        /// <summary>
        /// Gets the unique title.
        /// </summary>
-        /// <value>
-        /// The unique title.
-        /// </value>
        public string Title { get; }

        /// <summary>
        /// Gets the priority.
        /// </summary>
-        /// <value>
-        /// The priority.
-        /// </value>
        public int Priority { get; }

        /// <summary>
--- a/src/WireMock.Net/Matchers/Request/RequestMessageClientIPMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageClientIPMatcher.cs
@@ -25,7 +25,7 @@ namespace WireMock.Matchers.Request
        /// Initializes a new instance of the <see cref="RequestMessageClientIPMatcher"/> class.
        /// </summary>
        /// <param name="clientIPs">The clientIPs.</param>
-        public RequestMessageClientIPMatcher([NotNull] params string[] clientIPs) : this(clientIPs.Select(ip => new WildcardMatcher(ip)).ToArray())
+        public RequestMessageClientIPMatcher([NotNull] params string[] clientIPs) : this(clientIPs.Select(ip => new WildcardMatcher(ip)).Cast<IMatcher>().ToArray())
        {
        }

@@ -49,14 +49,7 @@ namespace WireMock.Matchers.Request
            Funcs = funcs;
        }

-        /// <summary>
-        /// Determines whether the specified RequestMessage is match.
-        /// </summary>
-        /// <param name="requestMessage">The RequestMessage.</param>
-        /// <param name="requestMatchResult">The RequestMatchResult.</param>
-        /// <returns>
-        /// A value between 0.0 - 1.0 of the similarity.
-        /// </returns>
+        /// <inheritdoc cref="IRequestMatcher.GetMatchingScore"/>
        public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
        {
            double score = IsMatch(requestMessage);
--- a/src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageHeaderMatcher.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
+using WireMock.Util;
 using WireMock.Validation;

 namespace WireMock.Matchers.Request
@@ -9,12 +10,13 @@ namespace WireMock.Matchers.Request
    /// <summary>
    /// The request header matcher.
    /// </summary>
+    /// <inheritdoc cref="IRequestMatcher"/>
    public class RequestMessageHeaderMatcher : IRequestMatcher
    {
        /// <summary>
        /// The functions
        /// </summary>
-        public Func<IDictionary<string, string>, bool>[] Funcs { get; }
+        public Func<IDictionary<string, string[]>, bool>[] Funcs { get; }

        /// <summary>
        /// The name
@@ -31,7 +33,7 @@ namespace WireMock.Matchers.Request
        /// </summary>
        /// <param name="name">The name.</param>
        /// <param name="pattern">The pattern.</param>
-        /// <param name="ignoreCase">The ignoreCase.</param>
+        /// <param name="ignoreCase">if set to <c>true</c> [ignore case].</param>
        public RequestMessageHeaderMatcher([NotNull] string name, [NotNull] string pattern, bool ignoreCase = true)
        {
            Check.NotNull(name, nameof(name));
@@ -41,6 +43,21 @@ namespace WireMock.Matchers.Request
            Matchers = new IMatcher[] { new WildcardMatcher(pattern, ignoreCase) };
        }

+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessageHeaderMatcher"/> class.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="patterns">The patterns.</param>
+        /// <param name="ignoreCase">if set to <c>true</c> [ignore case].</param>
+        public RequestMessageHeaderMatcher([NotNull] string name, [NotNull] string[] patterns, bool ignoreCase = true)
+        {
+            Check.NotNull(name, nameof(name));
+            Check.NotNull(patterns, nameof(patterns));
+
+            Name = name;
+            Matchers = patterns.Select(pattern => new WildcardMatcher(pattern, ignoreCase)).Cast<IMatcher>().ToArray();
+        }
+
        /// <summary>
        /// Initializes a new instance of the <see cref="RequestMessageHeaderMatcher"/> class.
        /// </summary>
@@ -59,21 +76,14 @@ namespace WireMock.Matchers.Request
        /// Initializes a new instance of the <see cref="RequestMessageHeaderMatcher"/> class.
        /// </summary>
        /// <param name="funcs">The funcs.</param>
-        public RequestMessageHeaderMatcher([NotNull] params Func<IDictionary<string, string>, bool>[] funcs)
+        public RequestMessageHeaderMatcher([NotNull] params Func<IDictionary<string, string[]>, bool>[] funcs)
        {
            Check.NotNull(funcs, nameof(funcs));

            Funcs = funcs;
        }

-        /// <summary>
-        /// Determines whether the specified RequestMessage is match.
-        /// </summary>
-        /// <param name="requestMessage">The RequestMessage.</param>
-        /// <param name="requestMatchResult">The RequestMatchResult.</param>
-        /// <returns>
-        /// A value between 0.0 - 1.0 of the similarity.
-        /// </returns>
+        /// <inheritdoc cref="IRequestMatcher.GetMatchingScore"/>
        public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
        {
            double score = IsMatch(requestMessage);
@@ -86,7 +96,7 @@ namespace WireMock.Matchers.Request
                return MatchScores.Mismatch;

            if (Funcs != null)
-                return MatchScores.ToScore(Funcs.Any(f => f(requestMessage.Headers)));
+                return MatchScores.ToScore(Funcs.Any(f => f(requestMessage.Headers.ToDictionary(entry => entry.Key, entry => entry.Value.ToArray()))));

            if (Matchers == null)
                return MatchScores.Mismatch;
@@ -94,8 +104,8 @@ namespace WireMock.Matchers.Request
            if (!requestMessage.Headers.ContainsKey(Name))
                return MatchScores.Mismatch;

-            string value = requestMessage.Headers[Name];
-            return Matchers.Max(m => m.IsMatch(value));
+            WireMockList<string> list = requestMessage.Headers[Name];
+            return Matchers.Max(m => list.Max(value => m.IsMatch(value))); // TODO : is this correct ?
        }
    }
 }
--- a/src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs
@@ -30,12 +30,8 @@ namespace WireMock.Matchers.Request
        /// <summary>
        /// Initializes a new instance of the <see cref="RequestMessageParamMatcher"/> class.
        /// </summary>
-        /// <param name="key">
-        /// The key.
-        /// </param>
-        /// <param name="values">
-        /// The values.
-        /// </param>
+        /// <param name="key">The key.</param>
+        /// <param name="values">The values.</param>
        public RequestMessageParamMatcher([NotNull] string key, [CanBeNull] IEnumerable<string> values)
        {
            Check.NotNull(key, nameof(key));
@@ -51,17 +47,11 @@ namespace WireMock.Matchers.Request
        public RequestMessageParamMatcher([NotNull] params Func<IDictionary<string, WireMockList<string>>, bool>[] funcs)
        {
            Check.NotNull(funcs, nameof(funcs));
+
            Funcs = funcs;
        }

-        /// <summary>
-        /// Determines whether the specified RequestMessage is match.
-        /// </summary>
-        /// <param name="requestMessage">The RequestMessage.</param>
-        /// <param name="requestMatchResult">The RequestMatchResult.</param>
-        /// <returns>
-        /// A value between 0.0 - 1.0 of the similarity.
-        /// </returns>
+        /// <inheritdoc cref="IRequestMatcher.GetMatchingScore"/>
        public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
        {
            double score = IsMatch(requestMessage);
@@ -71,7 +61,9 @@ namespace WireMock.Matchers.Request
        private double IsMatch(RequestMessage requestMessage)
        {
            if (Funcs != null)
+            {
                return MatchScores.ToScore(requestMessage.Query != null && Funcs.Any(f => f(requestMessage.Query)));
+            }

            List<string> values = requestMessage.GetParameter(Key);

--- a/src/WireMock.Net/Matchers/Request/RequestMessagePathMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessagePathMatcher.cs
@@ -25,7 +25,7 @@ namespace WireMock.Matchers.Request
        /// Initializes a new instance of the <see cref="RequestMessagePathMatcher"/> class.
        /// </summary>
        /// <param name="paths">The paths.</param>
-        public RequestMessagePathMatcher([NotNull] params string[] paths) : this(paths.Select(path => new WildcardMatcher(path)).ToArray())
+        public RequestMessagePathMatcher([NotNull] params string[] paths) : this(paths.Select(path => new WildcardMatcher(path)).Cast<IMatcher>().ToArray())
        {
        }

@@ -49,14 +49,7 @@ namespace WireMock.Matchers.Request
            Funcs = funcs;
        }

-        /// <summary>
-        /// Determines whether the specified RequestMessage is match.
-        /// </summary>
-        /// <param name="requestMessage">The RequestMessage.</param>
-        /// <param name="requestMatchResult">The RequestMatchResult.</param>
-        /// <returns>
-        /// A value between 0.0 - 1.0 of the similarity.
-        /// </returns>
+        /// <inheritdoc cref="IRequestMatcher.GetMatchingScore"/>
        public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
        {
            double score = IsMatch(requestMessage);
--- a/src/WireMock.Net/Matchers/Request/RequestMessageUrlMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageUrlMatcher.cs
@@ -25,7 +25,7 @@ namespace WireMock.Matchers.Request
        /// Initializes a new instance of the <see cref="RequestMessageUrlMatcher"/> class.
        /// </summary>
        /// <param name="urls">The urls.</param>
-        public RequestMessageUrlMatcher([NotNull] params string[] urls) : this(urls.Select(url => new WildcardMatcher(url)).ToArray())
+        public RequestMessageUrlMatcher([NotNull] params string[] urls) : this(urls.Select(url => new WildcardMatcher(url)).Cast<IMatcher>().ToArray())
        {
        }

@@ -49,14 +49,7 @@ namespace WireMock.Matchers.Request
            Funcs = funcs;
        }

-        /// <summary>
-        /// Determines whether the specified RequestMessage is match.
-        /// </summary>
-        /// <param name="requestMessage">The RequestMessage.</param>
-        /// <param name="requestMatchResult">The RequestMatchResult.</param>
-        /// <returns>
-        /// A value between 0.0 - 1.0 of the similarity.
-        /// </returns>
+        /// <inheritdoc cref="IRequestMatcher.GetMatchingScore"/>
        public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
        {
            double score = IsMatch(requestMessage);
--- a/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs
+++ b/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs
@@ -46,6 +46,7 @@ namespace WireMock.Owin
            _host = new WebHostBuilder()
                .Configure(appBuilder =>
                {
+                    appBuilder.UseMiddleware<GlobalExceptionMiddleware>();
                    _options.PreWireMockMiddlewareInit?.Invoke(appBuilder);
                    appBuilder.UseMiddleware<WireMockMiddleware>(_options);
                    _options.PostWireMockMiddlewareInit?.Invoke(appBuilder);
--- a/src/WireMock.Net/Owin/GlobalExceptionMiddleware.cs
+++ b/src/WireMock.Net/Owin/GlobalExceptionMiddleware.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+#if !NETSTANDARD
+using Microsoft.Owin;
+#else
+using Microsoft.AspNetCore.Http;
+#endif
+
+namespace WireMock.Owin
+{
+#if !NETSTANDARD
+    internal class GlobalExceptionMiddleware : OwinMiddleware
+#else
+    internal class GlobalExceptionMiddleware
+#endif
+    {
+#if !NETSTANDARD
+        public GlobalExceptionMiddleware(OwinMiddleware next) : base(next) { }
+#else
+        public GlobalExceptionMiddleware(RequestDelegate next)
+        {
+            Next = next;
+        }
+#endif
+
+#if NETSTANDARD
+        public RequestDelegate Next { get; }
+#endif
+
+        private readonly OwinResponseMapper _responseMapper = new OwinResponseMapper();
+
+#if !NETSTANDARD
+        public override async Task Invoke(IOwinContext ctx)
+#else
+        public async Task Invoke(HttpContext ctx)
+#endif
+        {
+            try
+            {
+                await Next?.Invoke(ctx);
+            }
+            catch (Exception ex)
+            {
+                await _responseMapper.MapAsync(new ResponseMessage { StatusCode = 500, Body = JsonConvert.SerializeObject(ex) }, ctx.Response);
+            }
+        }
+    }
+}
--- a/src/WireMock.Net/Owin/OwinRequestMapper.cs
+++ b/src/WireMock.Net/Owin/OwinRequestMapper.cs
@@ -57,13 +57,13 @@ namespace WireMock.Owin
                body = bodyEncoding.GetBytes(bodyAsString);
            }

-            Dictionary<string, string> headers = null;
+            Dictionary<string, string[]> headers = null;
            if (request.Headers.Any())
            {
-                headers = new Dictionary<string, string>();
+                headers = new Dictionary<string, string[]>();
                foreach (var header in request.Headers)
                {
-                    headers.Add(header.Key, header.Value.FirstOrDefault());
+                    headers.Add(header.Key, header.Value);
                }
            }

@@ -91,8 +91,9 @@ namespace WireMock.Owin
                TRACE - Body not supported.
                OPTIONS - Body supported but no semantics on usage (maybe in the future).
                CONNECT - No defined body semantics
+                PATCH - Body supported.
            */
-            return new[] { "PUT", "POST", "OPTIONS" }.Contains(method.ToUpper());
+            return new[] { "PUT", "POST", "OPTIONS", "PATCH" }.Contains(method.ToUpper());
        }
    }
 }
--- a/src/WireMock.Net/Owin/OwinResponseMapper.cs
+++ b/src/WireMock.Net/Owin/OwinResponseMapper.cs
@@ -1,8 +1,10 @@
-using System.IO;
+using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using WireMock.Http;
+using WireMock.Util;
 #if !NETSTANDARD
 using Microsoft.Owin;
 #else
@@ -18,6 +20,19 @@ namespace WireMock.Owin
    {
        private readonly Encoding _utf8NoBom = new UTF8Encoding(false);

+        // https://stackoverflow.com/questions/239725/cannot-set-some-http-headers-when-using-system-net-webrequest
+#if !NETSTANDARD
+        private static readonly IDictionary<string, Action<IOwinResponse, WireMockList<string>>> RestrictedResponseHeaders = new Dictionary<string, Action<IOwinResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
+#else
+        private static readonly IDictionary<string, Action<HttpResponse, WireMockList<string>>> RestrictedResponseHeaders = new Dictionary<string, Action<HttpResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
+#endif
+            { "Content-Length", null },
+            { "Content-Type", (r, v) => r.ContentType = v.FirstOrDefault() },
+            { "Keep-Alive", null },
+            { "Transfer-Encoding", null },
+            { "WWW-Authenticate", null }
+        };
+
        /// <summary>
        /// MapAsync ResponseMessage to OwinResponse
        /// </summary>
@@ -33,13 +48,24 @@ namespace WireMock.Owin
        {
            response.StatusCode = responseMessage.StatusCode;

-            if (responseMessage.Headers.ContainsKey(HttpKnownHeaderNames.ContentType))
+            // Set headers
+            foreach (var pair in responseMessage.Headers)
            {
-                response.ContentType = responseMessage.Headers[HttpKnownHeaderNames.ContentType];
+                if (RestrictedResponseHeaders.ContainsKey(pair.Key))
+                {
+                    RestrictedResponseHeaders[pair.Key]?.Invoke(response, pair.Value);
+                }
+                else
+                {
+#if !NETSTANDARD
+                    response.Headers.AppendValues(pair.Key, pair.Value.ToArray());
+#else
+                    response.Headers.Append(pair.Key, pair.Value.ToArray());
+#endif
+                }
            }
-            responseMessage.Headers.Where(h => h.Key != HttpKnownHeaderNames.ContentType).ToList().ForEach(pair => response.Headers.Append(pair.Key, pair.Value));

-            if (responseMessage.Body == null && responseMessage.BodyAsBytes == null)
+            if (responseMessage.Body == null && responseMessage.BodyAsBytes == null && responseMessage.BodyAsFile == null)
            {
                return;
            }
@@ -50,6 +76,14 @@ namespace WireMock.Owin
                return;
            }

+            if (responseMessage.BodyAsFile != null)
+            {
+                byte[] bytes = File.ReadAllBytes(responseMessage.BodyAsFile);
+
+                await response.Body.WriteAsync(bytes, 0, bytes.Length);
+                return;
+            }
+
            Encoding encoding = responseMessage.BodyEncoding ?? _utf8NoBom;
            using (var writer = new StreamWriter(response.Body, encoding))
            {
--- a/src/WireMock.Net/Owin/OwinSelfHost.cs
+++ b/src/WireMock.Net/Owin/OwinSelfHost.cs
@@ -57,10 +57,11 @@ namespace WireMock.Owin

        private void StartServers()
        {
-            Console.WriteLine("WireMock.Net server using .net 4.5.x or .net 4.6.x");
+            Console.WriteLine("WireMock.Net server using .net 4.5.x or higher");

            Action<IAppBuilder> startup = app =>
            {
+                app.Use<GlobalExceptionMiddleware>();
                _options.PreWireMockMiddlewareInit?.Invoke(app);
                app.Use<WireMockMiddleware>(_options);
                _options.PostWireMockMiddlewareInit?.Invoke(app);
--- a/src/WireMock.Net/Owin/WireMockMiddleware.cs
+++ b/src/WireMock.Net/Owin/WireMockMiddleware.cs
@@ -4,6 +4,8 @@ using WireMock.Logging;
 using WireMock.Matchers.Request;
 using System.Linq;
 using WireMock.Matchers;
+using WireMock.Util;
+using Newtonsoft.Json;
 #if !NETSTANDARD
 using Microsoft.Owin;
 #else
@@ -101,8 +103,8 @@ namespace WireMock.Owin

                if (targetMapping.IsAdminInterface && _options.AuthorizationMatcher != null)
                {
-                    bool present = request.Headers.TryGetValue("Authorization", out string authorization);
-                    if (!present || _options.AuthorizationMatcher.IsMatch(authorization) < MatchScores.Perfect)
+                    bool present = request.Headers.TryGetValue("Authorization", out WireMockList<string> authorization);
+                    if (!present || _options.AuthorizationMatcher.IsMatch(authorization.ToString()) < MatchScores.Perfect)
                    {
                        response = new ResponseMessage { StatusCode = 401 };
                        return;
@@ -123,7 +125,7 @@ namespace WireMock.Owin
            }
            catch (Exception ex)
            {
-                response = new ResponseMessage { StatusCode = 500, Body = ex.ToString() };
+                response = new ResponseMessage { StatusCode = 500, Body = JsonConvert.SerializeObject(ex) };
            }
            finally
            {
--- a/src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs
+++ b/src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using WireMock.Logging;
 using WireMock.Matchers;
+using WireMock.Util;
 #if !NETSTANDARD
 using Owin;
 #else
@@ -22,7 +23,7 @@ namespace WireMock.Owin

        public IList<Mapping> Mappings { get; set; } = new List<Mapping>();

-        public ObservableCollection<LogEntry> LogEntries { get; } = new ObservableCollection<LogEntry>();
+        public ObservableCollection<LogEntry> LogEntries { get; } = new ConcurentObservableCollection<LogEntry>();

        public int? RequestLogExpirationDuration { get; set; }

--- a/src/WireMock.Net/RequestBuilders/IHeadersAndCookiesRequestBuilder.cs
+++ b/src/WireMock.Net/RequestBuilders/IHeadersAndCookiesRequestBuilder.cs
@@ -12,7 +12,7 @@ namespace WireMock.RequestBuilders
    public interface IHeadersAndCookiesRequestBuilder : IBodyRequestBuilder, IRequestMatcher, IParamsRequestBuilder
    {
        /// <summary>
-        /// The with header.
+        /// Add Header matching based on name, pattern and ignoreCase.
        /// </summary>
        /// <param name="name">The name.</param>
        /// <param name="pattern">The pattern.</param>
@@ -20,6 +20,15 @@ namespace WireMock.RequestBuilders
        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
        IRequestBuilder WithHeader([NotNull] string name, string pattern, bool ignoreCase = true);

+        /// <summary>
+        /// Add Header matching based on name, patterns and ignoreCase.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="patterns">The patterns.</param>
+        /// <param name="ignoreCase">ignore Case</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithHeader([NotNull] string name, string[] patterns, bool ignoreCase = true);
+
        /// <summary>
        /// The with header.
        /// </summary>
@@ -33,7 +42,7 @@ namespace WireMock.RequestBuilders
        /// </summary>
        /// <param name="funcs">The headers funcs.</param>
        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithHeader([NotNull] params Func<IDictionary<string, string>, bool>[] funcs);
+        IRequestBuilder WithHeader([NotNull] params Func<IDictionary<string, string[]>, bool>[] funcs);

        /// <summary>
        /// The with cookie.
--- a/src/WireMock.Net/RequestBuilders/IMethodRequestBuilder.cs
+++ b/src/WireMock.Net/RequestBuilders/IMethodRequestBuilder.cs
@@ -7,6 +7,14 @@ namespace WireMock.RequestBuilders
    /// </summary>
    public interface IMethodRequestBuilder : IHeadersAndCookiesRequestBuilder
    {
+        /// <summary>
+        /// The using delete.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="IRequestBuilder"/>.
+        /// </returns>
+        IRequestBuilder UsingDelete();
+
        /// <summary>
        /// The using get.
        /// </summary>
@@ -15,6 +23,14 @@ namespace WireMock.RequestBuilders
        /// </returns>
        IRequestBuilder UsingGet();

+        /// <summary>
+        /// The using head.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="IRequestBuilder"/>.
+        /// </returns>
+        IRequestBuilder UsingHead();
+
        /// <summary>
        /// The using post.
        /// </summary>
@@ -24,12 +40,12 @@ namespace WireMock.RequestBuilders
        IRequestBuilder UsingPost();

        /// <summary>
-        /// The using delete.
+        /// The using patch.
        /// </summary>
        /// <returns>
        /// The <see cref="IRequestBuilder"/>.
        /// </returns>
-        IRequestBuilder UsingDelete();
+        IRequestBuilder UsingPatch();

        /// <summary>
        /// The using put.
@@ -39,14 +55,6 @@ namespace WireMock.RequestBuilders
        /// </returns>
        IRequestBuilder UsingPut();

-        /// <summary>
-        /// The using head.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="IRequestBuilder"/>.
-        /// </returns>
-        IRequestBuilder UsingHead();
-
        /// <summary>
        /// The using any verb.
        /// </summary>
--- a/src/WireMock.Net/RequestBuilders/Request.cs
+++ b/src/WireMock.Net/RequestBuilders/Request.cs
@@ -171,70 +171,49 @@ namespace WireMock.RequestBuilders
            return this;
        }

-        /// <summary>
-        /// The using get.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="IRequestBuilder"/>.
-        /// </returns>
-        public IRequestBuilder UsingGet()
-        {
-            _requestMatchers.Add(new RequestMessageMethodMatcher("get"));
-            return this;
-        }
-
-        /// <summary>
-        /// The using post.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="IRequestBuilder"/>.
-        /// </returns>
-        public IRequestBuilder UsingPost()
-        {
-            _requestMatchers.Add(new RequestMessageMethodMatcher("post"));
-            return this;
-        }
-
-        /// <summary>
-        /// The using put.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="IRequestBuilder"/>.
-        /// </returns>
-        public IRequestBuilder UsingPut()
-        {
-            _requestMatchers.Add(new RequestMessageMethodMatcher("put"));
-            return this;
-        }
-
-        /// <summary>
-        /// The using delete.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="IRequestBuilder"/>.
-        /// </returns>
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingDelete"/>
        public IRequestBuilder UsingDelete()
        {
            _requestMatchers.Add(new RequestMessageMethodMatcher("delete"));
            return this;
        }

-        /// <summary>
-        /// The using head.
-        /// </summary>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingGet"/>
+        public IRequestBuilder UsingGet()
+        {
+            _requestMatchers.Add(new RequestMessageMethodMatcher("get"));
+            return this;
+        }
+
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingHead"/>
        public IRequestBuilder UsingHead()
        {
            _requestMatchers.Add(new RequestMessageMethodMatcher("head"));
            return this;
        }

-        /// <summary>
-        /// The using any verb.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="IRequestBuilder"/>.
-        /// </returns>
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingPost"/>
+        public IRequestBuilder UsingPost()
+        {
+            _requestMatchers.Add(new RequestMessageMethodMatcher("post"));
+            return this;
+        }
+
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingPatch"/>
+        public IRequestBuilder UsingPatch()
+        {
+            _requestMatchers.Add(new RequestMessageMethodMatcher("patch"));
+            return this;
+        }
+
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingPut"/>
+        public IRequestBuilder UsingPut()
+        {
+            _requestMatchers.Add(new RequestMessageMethodMatcher("put"));
+            return this;
+        }
+
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingAnyVerb"/>
        public IRequestBuilder UsingAnyVerb()
        {
            var matchers = _requestMatchers.Where(m => m is RequestMessageMethodMatcher).ToList();
@@ -246,11 +225,7 @@ namespace WireMock.RequestBuilders
            return this;
        }

-        /// <summary>
-        /// The using verb.
-        /// </summary>
-        /// <param name="verbs">The verbs.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingVerb"/>
        public IRequestBuilder UsingVerb(params string[] verbs)
        {
            Check.NotEmpty(verbs, nameof(verbs));
@@ -359,13 +334,7 @@ namespace WireMock.RequestBuilders
            return this;
        }

-        /// <summary>
-        /// With header.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="pattern">The pattern.</param>
-        /// <param name="ignoreCase">if set to <c>true</c> [ignore case].</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IHeadersAndCookiesRequestBuilder.WithHeader(string,string,bool)"/>
        public IRequestBuilder WithHeader(string name, string pattern, bool ignoreCase = true)
        {
            Check.NotNull(name, nameof(name));
@@ -375,6 +344,16 @@ namespace WireMock.RequestBuilders
            return this;
        }

+        /// <inheritdoc cref="IHeadersAndCookiesRequestBuilder.WithHeader(string,string[],bool)"/>
+        public IRequestBuilder WithHeader(string name, string[] patterns, bool ignoreCase = true)
+        {
+            Check.NotNull(name, nameof(name));
+            Check.NotNull(patterns, nameof(patterns));
+
+            _requestMatchers.Add(new RequestMessageHeaderMatcher(name, patterns, ignoreCase));
+            return this;
+        }
+
        /// <summary>
        /// With header.
        /// </summary>
@@ -395,7 +374,7 @@ namespace WireMock.RequestBuilders
        /// </summary>
        /// <param name="funcs">The funcs.</param>
        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        public IRequestBuilder WithHeader(params Func<IDictionary<string, string>, bool>[] funcs)
+        public IRequestBuilder WithHeader(params Func<IDictionary<string, string[]>, bool>[] funcs)
        {
            Check.NotEmpty(funcs, nameof(funcs));

--- a/src/WireMock.Net/RequestMessage.cs
+++ b/src/WireMock.Net/RequestMessage.cs
@@ -1,146 +1,177 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using JetBrains.Annotations;
-using WireMock.Util;
-using WireMock.Validation;
-using System.Text;
-
-namespace WireMock
-{
-    /// <summary>
-    /// The request.
-    /// </summary>
-    public class RequestMessage
-    {
-        /// <summary>
-        /// Gets the Client IP Address.
-        /// </summary>
-        public string ClientIP { get; }
-
-        /// <summary>
-        /// Gets the url.
-        /// </summary>
-        public string Url { get; }
-
-        /// <summary>
-        /// Gets the DateTime.
-        /// </summary>
-        public DateTime DateTime { get; set; }
-
-        /// <summary>
-        /// Gets the path.
-        /// </summary>
-        public string Path { get; }
-
-        /// <summary>
-        /// Gets the method.
-        /// </summary>
-        public string Method { get; }
-
-        /// <summary>
-        /// Gets the headers.
-        /// </summary>
-        public IDictionary<string, string> Headers { get; }
-
-        /// <summary>
-        /// Gets the cookies.
-        /// </summary>
-        public IDictionary<string, string> Cookies { get; }
-
-        /// <summary>
-        /// Gets the query.
-        /// </summary>
-        public IDictionary<string, WireMockList<string>> Query { get; }
-
-        /// <summary>
-        /// Gets the bodyAsBytes.
-        /// </summary>
-        public byte[] BodyAsBytes { get; }
-
-        /// <summary>
-        /// Gets the body.
-        /// </summary>
-        public string Body { get; }
-
-        /// <summary>
-        /// Gets the body encoding.
-        /// </summary>
-        public Encoding BodyEncoding { get; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessage"/> class.
-        /// </summary>
-        /// <param name="url">The original url.</param>
-        /// <param name="method">The HTTP method.</param>
-        /// <param name="clientIP">The client IP Address.</param>
-        /// <param name="bodyAsBytes">The bodyAsBytes byte[].</param>
-        /// <param name="body">The body string.</param>
-        /// <param name="bodyEncoding">The body encoding</param>
-        /// <param name="headers">The headers.</param>
-        /// <param name="cookies">The cookies.</param>
-        public RequestMessage([NotNull] Uri url, [NotNull] string method, [NotNull] string clientIP, [CanBeNull] byte[] bodyAsBytes = null, [CanBeNull] string body = null, [CanBeNull] Encoding bodyEncoding = null, [CanBeNull] IDictionary<string, string> headers = null, [CanBeNull] IDictionary<string, string> cookies = null)
-        {
-            Check.NotNull(url, nameof(url));
-            Check.NotNull(method, nameof(method));
-            Check.NotNull(clientIP, nameof(clientIP));
-
-            Url = url.ToString();
-            Path = url.AbsolutePath;
-            Method = method.ToLower();
-            ClientIP = clientIP;
-            BodyAsBytes = bodyAsBytes;
-            Body = body;
-            BodyEncoding = bodyEncoding;
-            Headers = headers;
-            Cookies = cookies;
-            Query = ParseQuery(url.Query);
-        }
-
-        private IDictionary<string, WireMockList<string>> ParseQuery(string queryString)
-        {
-            if (string.IsNullOrEmpty(queryString))
-            {
-                return null;
-            }
-
-            if (queryString.StartsWith("?"))
-            {
-                queryString = queryString.Substring(1);
-            }
-
-            return queryString.Split('&').Aggregate(new Dictionary<string, WireMockList<string>>(),
-                (dict, term) =>
-                {
-                    var parts = term.Split('=');
-                    string key = parts[0];
-                    if (!dict.ContainsKey(key))
-                    {
-                        dict.Add(key, new WireMockList<string>());
-                    }
-
-                    if (parts.Length == 2)
-                    {
-                        dict[key].Add(parts[1]);
-                    }
-
-                    return dict;
-                });
-        }
-
-        /// <summary>
-        /// The get a query parameter.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <returns>The query parameter.</returns>
-        public List<string> GetParameter(string key)
-        {
-            if (Query == null)
-            {
-                return null;
-            }
-
-            return Query.ContainsKey(key) ? Query[key] : null;
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Net;
+using JetBrains.Annotations;
+using WireMock.Util;
+using WireMock.Validation;
+
+namespace WireMock
+{
+    /// <summary>
+    /// The request.
+    /// </summary>
+    public class RequestMessage
+    {
+        /// <summary>
+        /// Gets the Client IP Address.
+        /// </summary>
+        public string ClientIP { get; }
+
+        /// <summary>
+        /// Gets the url.
+        /// </summary>
+        public string Url { get; }
+
+        /// <summary>
+        /// Gets the DateTime.
+        /// </summary>
+        public DateTime DateTime { get; set; }
+
+        /// <summary>
+        /// Gets the path.
+        /// </summary>
+        public string Path { get; }
+
+        /// <summary>
+        /// Gets the method.
+        /// </summary>
+        public string Method { get; }
+
+        /// <summary>
+        /// Gets the headers.
+        /// </summary>
+        public IDictionary<string, WireMockList<string>> Headers { get; }
+
+        /// <summary>
+        /// Gets the cookies.
+        /// </summary>
+        public IDictionary<string, string> Cookies { get; }
+
+        /// <summary>
+        /// Gets the query.
+        /// </summary>
+        public IDictionary<string, WireMockList<string>> Query { get; }
+
+        /// <summary>
+        /// Gets the raw query.
+        /// </summary>
+        public string RawQuery { get; }
+
+        /// <summary>
+        /// Gets the bodyAsBytes.
+        /// </summary>
+        public byte[] BodyAsBytes { get; }
+
+        /// <summary>
+        /// Gets the body.
+        /// </summary>
+        public string Body { get; }
+
+        /// <summary>
+        /// Gets the Host
+        /// </summary>
+        public string Host { get; }
+
+        /// <summary>
+        /// Gets the protocol
+        /// </summary>
+        public string Protocol { get; }
+
+        /// <summary>
+        /// Gets the port
+        /// </summary>
+        public int Port { get; }
+
+        /// <summary>
+        /// Gets the origin
+        /// </summary>
+        public string Origin { get; }
+
+        /// <summary>
+        /// Gets the body encoding.
+        /// </summary>
+        public Encoding BodyEncoding { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessage"/> class.
+        /// </summary>
+        /// <param name="url">The original url.</param>
+        /// <param name="method">The HTTP method.</param>
+        /// <param name="clientIP">The client IP Address.</param>
+        /// <param name="bodyAsBytes">The bodyAsBytes byte[].</param>
+        /// <param name="body">The body string.</param>
+        /// <param name="bodyEncoding">The body encoding</param>
+        /// <param name="headers">The headers.</param>
+        /// <param name="cookies">The cookies.</param>
+        public RequestMessage([NotNull] Uri url, [NotNull] string method, [NotNull] string clientIP, [CanBeNull] byte[] bodyAsBytes = null, [CanBeNull] string body = null, [CanBeNull] Encoding bodyEncoding = null, [CanBeNull] IDictionary<string, string[]> headers = null, [CanBeNull] IDictionary<string, string> cookies = null)
+        {
+            Check.NotNull(url, nameof(url));
+            Check.NotNull(method, nameof(method));
+            Check.NotNull(clientIP, nameof(clientIP));
+
+            Url = url.ToString();
+            Protocol = url.Scheme;
+            Host = url.Host;
+            Port = url.Port;
+            Origin = $"{url.Scheme}://{url.Host}:{url.Port}";
+            Path = WebUtility.UrlDecode(url.AbsolutePath);
+            Method = method.ToLower();
+            ClientIP = clientIP;
+            BodyAsBytes = bodyAsBytes;
+            Body = body;
+            BodyEncoding = bodyEncoding;
+            Headers = headers?.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
+            Cookies = cookies;
+            RawQuery = WebUtility.UrlDecode(url.Query);
+            Query = ParseQuery(RawQuery);
+        }
+
+        private static IDictionary<string, WireMockList<string>> ParseQuery(string queryString)
+        {
+            if (string.IsNullOrEmpty(queryString))
+            {
+                return null;
+            }
+
+            if (queryString.StartsWith("?"))
+            {
+                queryString = queryString.Substring(1);
+            }
+
+            return queryString.Split('&').Aggregate(new Dictionary<string, WireMockList<string>>(),
+                (dict, term) =>
+                {
+                    var parts = term.Split('=');
+                    string key = parts[0];
+                    if (!dict.ContainsKey(key))
+                    {
+                        dict.Add(key, new WireMockList<string>());
+                    }
+
+                    if (parts.Length == 2)
+                    {
+                        dict[key].Add(parts[1]);
+                    }
+
+                    return dict;
+                });
+        }
+
+        /// <summary>
+        /// Get a query parameter.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <returns>The query parameter.</returns>
+        public List<string> GetParameter(string key)
+        {
+            if (Query == null)
+            {
+                return null;
+            }
+
+            return Query.ContainsKey(key) ? Query[key] : null;
+        }
+    }
 }
--- a/src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs
+++ b/src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs
@@ -9,14 +9,6 @@ namespace WireMock.ResponseBuilders
    /// </summary>
    public interface IBodyResponseBuilder : ITransformResponseBuilder
    {
-        ///// <summary>
-        ///// WithBody : Create a string response based on a string.
-        ///// </summary>
-        ///// <param name="body">The body.</param>
-        ///// <param name="encoding">The body encoding.</param>
-        ///// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        //// IResponseBuilder WithBody([NotNull] string body, [CanBeNull] Encoding encoding = null);
-
        /// <summary>
        /// WithBody : Create a ... response based on a string.
        /// </summary>
@@ -51,5 +43,13 @@ namespace WireMock.ResponseBuilders
        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
        [Obsolete]
        IResponseBuilder WithBodyFromBase64([NotNull] string bodyAsbase64, [CanBeNull] Encoding encoding = null);
+
+        /// <summary>
+        /// WithBodyFromFile : Create a ... response based on a File.
+        /// </summary>
+        /// <param name="filename">The filename.</param>
+        /// <param name="cache">Defines if this file is cached in memory or retrieved from disk everytime the response is created.</param>
+        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithBodyFromFile([NotNull] string filename, bool cache = true);
    }
 }
--- a/src/WireMock.Net/ResponseBuilders/IHeadersResponseBuilder.cs
+++ b/src/WireMock.Net/ResponseBuilders/IHeadersResponseBuilder.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
+using WireMock.Util;

 namespace WireMock.ResponseBuilders
 {
@@ -12,15 +13,29 @@ namespace WireMock.ResponseBuilders
        /// The with header.
        /// </summary>
        /// <param name="name">The name.</param>
-        /// <param name="value">The value.</param>
+        /// <param name="values">The values.</param>
        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithHeader([NotNull] string name, string value);
+        IResponseBuilder WithHeader([NotNull] string name, params string[] values);

        /// <summary>
        /// The with headers.
        /// </summary>
        /// <param name="headers">The headers.</param>
        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithHeaders([NotNull] IDictionary<string,string> headers);
+        IResponseBuilder WithHeaders([NotNull] IDictionary<string, string> headers);
+
+        /// <summary>
+        /// The with headers.
+        /// </summary>
+        /// <param name="headers">The headers.</param>
+        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithHeaders([NotNull] IDictionary<string, string[]> headers);
+
+        /// <summary>
+        /// The with headers.
+        /// </summary>
+        /// <param name="headers">The headers.</param>
+        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithHeaders([NotNull] IDictionary<string, WireMockList<string>> headers);
    }
 }
--- a/src/WireMock.Net/ResponseBuilders/Response.cs
+++ b/src/WireMock.Net/ResponseBuilders/Response.cs
@@ -1,13 +1,17 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
-using WireMock.Validation;
 using WireMock.Http;
 using WireMock.Transformers;
+using WireMock.Util;
+using WireMock.Validation;

 namespace WireMock.ResponseBuilders
 {
@@ -16,6 +20,8 @@ namespace WireMock.ResponseBuilders
    /// </summary>
    public class Response : IResponseBuilder
    {
+        private HttpClient _httpClientForProxy;
+
        /// <summary>
        /// The delay
        /// </summary>
@@ -125,26 +131,35 @@ namespace WireMock.ResponseBuilders
            return WithStatusCode((int)HttpStatusCode.NotFound);
        }

-        /// <summary>
-        /// The with header.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="value">The value.</param>
-        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
-        public IResponseBuilder WithHeader(string name, string value)
+        /// <inheritdoc cref="IHeadersResponseBuilder.WithHeader(string, string[])"/>
+        public IResponseBuilder WithHeader(string name, params string[] values)
        {
            Check.NotNull(name, nameof(name));

-            ResponseMessage.AddHeader(name, value);
+            ResponseMessage.AddHeader(name, values);
            return this;
        }

-        /// <summary>
-        /// The with headers.
-        /// </summary>
-        /// <param name="headers">The headers.</param>
-        /// <returns></returns>
+        /// <inheritdoc cref="IHeadersResponseBuilder.WithHeaders(IDictionary{string, string})"/>
        public IResponseBuilder WithHeaders(IDictionary<string, string> headers)
+        {
+            Check.NotNull(headers, nameof(headers));
+
+            ResponseMessage.Headers = headers.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
+            return this;
+        }
+
+        /// <inheritdoc cref="IHeadersResponseBuilder.WithHeaders(IDictionary{string, string[]})"/>
+        public IResponseBuilder WithHeaders(IDictionary<string, string[]> headers)
+        {
+            Check.NotNull(headers, nameof(headers));
+
+            ResponseMessage.Headers = headers.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
+            return this;
+        }
+
+        /// <inheritdoc cref="IHeadersResponseBuilder.WithHeaders(IDictionary{string, WireMockList{string}})"/>
+        public IResponseBuilder WithHeaders(IDictionary<string, WireMockList<string>> headers)
        {
            ResponseMessage.Headers = headers;
            return this;
@@ -175,6 +190,30 @@ namespace WireMock.ResponseBuilders
            return this;
        }

+        /// <inheritdoc cref="IBodyResponseBuilder.WithBodyFromFile"/>
+        public IResponseBuilder WithBodyFromFile(string filename, bool cache = true)
+        {
+            Check.NotNull(filename, nameof(filename));
+
+            ResponseMessage.BodyEncoding = null;
+            ResponseMessage.BodyAsFileIsCached = cache;
+
+            if (cache)
+            {
+                ResponseMessage.Body = null;
+                ResponseMessage.BodyAsBytes = File.ReadAllBytes(filename);
+                ResponseMessage.BodyAsFile = null;
+            }
+            else
+            {
+                ResponseMessage.Body = null;
+                ResponseMessage.BodyAsBytes = null;
+                ResponseMessage.BodyAsFile = filename;
+            }
+
+            return this;
+        }
+
        /// <inheritdoc cref="IBodyResponseBuilder.WithBody(string, string, Encoding)"/>
        public IResponseBuilder WithBody(string body, string destination = BodyDestinationFormat.SameAsSource, Encoding encoding = null)
        {
@@ -235,35 +274,23 @@ namespace WireMock.ResponseBuilders
            return this;
        }

-        /// <summary>
-        /// The with transformer.
-        /// </summary>
-        /// <returns>
-        /// The <see cref="IResponseBuilder"/>.
-        /// </returns>
+        /// <inheritdoc cref="ITransformResponseBuilder.WithTransformer"/>
        public IResponseBuilder WithTransformer()
        {
            UseTransformer = true;
            return this;
        }

-        /// <summary>
-        /// The with delay.
-        /// </summary>
-        /// <param name="delay">The TimeSpan to delay.</param>
-        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+        /// <inheritdoc cref="IDelayResponseBuilder.WithDelay(TimeSpan)"/>
        public IResponseBuilder WithDelay(TimeSpan delay)
        {
            Check.Condition(delay, d => d > TimeSpan.Zero, nameof(delay));
+
            Delay = delay;
            return this;
        }

-        /// <summary>
-        /// The with delay.
-        /// </summary>
-        /// <param name="milliseconds">The milliseconds to delay.</param>
-        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+        /// <inheritdoc cref="IDelayResponseBuilder.WithDelay(int)"/>
        public IResponseBuilder WithDelay(int milliseconds)
        {
            return WithDelay(TimeSpan.FromMilliseconds(milliseconds));
@@ -281,6 +308,7 @@ namespace WireMock.ResponseBuilders

            ProxyUrl = proxyUrl;
            X509Certificate2ThumbprintOrSubjectName = clientX509Certificate2ThumbprintOrSubjectName;
+            _httpClientForProxy = HttpClientHelper.CreateHttpClient(clientX509Certificate2ThumbprintOrSubjectName);
            return this;
        }

@@ -294,14 +322,17 @@ namespace WireMock.ResponseBuilders
            Check.NotNull(requestMessage, nameof(requestMessage));

            if (Delay != null)
+            {
                await Task.Delay(Delay.Value);
+            }

-            if (ProxyUrl != null)
+            if (ProxyUrl != null && _httpClientForProxy != null)
            {
                var requestUri = new Uri(requestMessage.Url);
                var proxyUri = new Uri(ProxyUrl);
                var proxyUriWithRequestPathAndQuery = new Uri(proxyUri, requestUri.PathAndQuery);
-                return await HttpClientHelper.SendAsync(requestMessage, proxyUriWithRequestPathAndQuery.AbsoluteUri, X509Certificate2ThumbprintOrSubjectName);
+
+                return await HttpClientHelper.SendAsync(_httpClientForProxy, requestMessage, proxyUriWithRequestPathAndQuery.AbsoluteUri);
            }

            if (UseTransformer)
--- a/src/WireMock.Net/ResponseMessage.cs
+++ b/src/WireMock.Net/ResponseMessage.cs
@@ -1,6 +1,9 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
+using WireMock.Util;
+using WireMock.Validation;

 namespace WireMock
 {
@@ -12,7 +15,7 @@ namespace WireMock
        /// <summary>
        /// Gets the headers.
        /// </summary>
-        public IDictionary<string, string> Headers { get; set; } = new ConcurrentDictionary<string, string>();
+        public IDictionary<string, WireMockList<string>> Headers { get; set; } = new ConcurrentDictionary<string, WireMockList<string>>();

        /// <summary>
        /// Gets or sets the status code.
@@ -30,32 +33,54 @@ namespace WireMock
        public string BodyDestination { get; set; }

        /// <summary>
-        /// Gets or sets the body.
+        /// Gets or sets the body as a string.
        /// </summary>
        public string Body { get; set; }

        /// <summary>
-        /// Gets or sets the body.
+        /// Gets or sets the body as bytes.
        /// </summary>
        public byte[] BodyAsBytes { get; set; }

+        /// <summary>
+        /// Gets or sets the body as a file.
+        /// </summary>
+        public string BodyAsFile { get; set; }
+
+        /// <summary>
+        /// Is the body as file cached?
+        /// </summary>
+        public bool? BodyAsFileIsCached { get; set; }
+
        /// <summary>
        /// Gets or sets the body encoding.
        /// </summary>
        public Encoding BodyEncoding { get; set; } = new UTF8Encoding(false);

        /// <summary>
-        /// The add header.
+        /// Adds the header.
        /// </summary>
-        /// <param name="name">
-        /// The name.
-        /// </param>
-        /// <param name="value">
-        /// The value.
-        /// </param>
+        /// <param name="name">The name.</param>
+        /// <param name="value">The value.</param>
        public void AddHeader(string name, string value)
        {
-            Headers.Add(name, value);
+            Headers.Add(name, new WireMockList<string>(value));
+        }
+
+        /// <summary>
+        /// Adds the header.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="values">The values.</param>
+        public void AddHeader(string name, params string[] values)
+        {
+            Check.NotEmpty(values, nameof(values));
+
+            var newHeaderValues = Headers.TryGetValue(name, out WireMockList<string> existingValues)
+                ? values.Union(existingValues).ToArray()
+                : values;
+
+            Headers[name] = new WireMockList<string>(newHeaderValues);
        }
    }
 }
--- a/src/WireMock.Net/Serialization/MappingConverter.cs
+++ b/src/WireMock.Net/Serialization/MappingConverter.cs
@@ -8,6 +8,7 @@ using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
+using WireMock.Util;

 namespace WireMock.Serialization
 {
@@ -78,7 +79,7 @@ namespace WireMock.Serialization
                        Funcs = Map(pm.Funcs)
                    }).ToList() : null,

-                    Body = methodMatcher?.Methods != null && methodMatcher.Methods.Count(m => m == "get") == 1 ? null : new BodyModel
+                    Body = methodMatcher?.Methods != null && methodMatcher.Methods.Any(m => m == "get") ? null : new BodyModel
                    {
                        Matcher = bodyMatcher != null ? Map(bodyMatcher.Matcher) : null,
                        Func = bodyMatcher != null ? Map(bodyMatcher.Func) : null,
@@ -98,6 +99,8 @@ namespace WireMock.Serialization
                mappingModel.Response.BodyDestination = null;
                mappingModel.Response.Body = null;
                mappingModel.Response.BodyAsBytes = null;
+                mappingModel.Response.BodyAsFile = null;
+                mappingModel.Response.BodyAsFileIsCached = null;
                mappingModel.Response.UseTransformer = false;
                mappingModel.Response.BodyEncoding = null;
                mappingModel.Response.ProxyUrl = response.ProxyUrl;
@@ -106,24 +109,45 @@ namespace WireMock.Serialization
            {
                mappingModel.Response.BodyDestination = response.ResponseMessage.BodyDestination;
                mappingModel.Response.StatusCode = response.ResponseMessage.StatusCode;
-                mappingModel.Response.Headers = response.ResponseMessage.Headers;
+                mappingModel.Response.Headers = Map(response.ResponseMessage.Headers);
                mappingModel.Response.Body = response.ResponseMessage.Body;
                mappingModel.Response.BodyAsBytes = response.ResponseMessage.BodyAsBytes;
+                mappingModel.Response.BodyAsFile = response.ResponseMessage.BodyAsFile;
+                mappingModel.Response.BodyAsFileIsCached = response.ResponseMessage.BodyAsFileIsCached;
                mappingModel.Response.UseTransformer = response.UseTransformer;
-                mappingModel.Response.BodyEncoding = response.ResponseMessage.BodyEncoding != null
-                    ? new EncodingModel
+
+                if (response.ResponseMessage.BodyEncoding != null)
+                {
+                    mappingModel.Response.BodyEncoding = new EncodingModel
                    {
                        EncodingName = response.ResponseMessage.BodyEncoding.EncodingName,
                        CodePage = response.ResponseMessage.BodyEncoding.CodePage,
                        WebName = response.ResponseMessage.BodyEncoding.WebName
-                    }
-                    : null;
+                    };
+                }
            }

            return mappingModel;
        }

-        public static MatcherModel[] Map([CanBeNull] IEnumerable<IMatcher> matchers)
+        private static IDictionary<string, object> Map(IDictionary<string, WireMockList<string>> dictionary)
+        {
+            if (dictionary == null)
+            {
+                return null;
+            }
+
+            var newDictionary = new Dictionary<string, object>();
+            foreach (var entry in dictionary)
+            {
+                object value = entry.Value.Count == 1 ? (object)entry.Value.ToString() : entry.Value;
+                newDictionary.Add(entry.Key, value);
+            }
+
+            return newDictionary;
+        }
+
+        private static MatcherModel[] Map([CanBeNull] IEnumerable<IMatcher> matchers)
        {
            if (matchers == null || !matchers.Any())
                return null;
@@ -131,7 +155,7 @@ namespace WireMock.Serialization
            return matchers.Select(Map).Where(x => x != null).ToArray();
        }

-        public static MatcherModel Map([CanBeNull] IMatcher matcher)
+        private static MatcherModel Map([CanBeNull] IMatcher matcher)
        {
            if (matcher == null)
                return null;
@@ -146,7 +170,7 @@ namespace WireMock.Serialization
            };
        }

-        public static string[] Map<T>([CanBeNull] IEnumerable<Func<T, bool>> funcs)
+        private static string[] Map<T>([CanBeNull] IEnumerable<Func<T, bool>> funcs)
        {
            if (funcs == null || !funcs.Any())
                return null;
@@ -154,7 +178,7 @@ namespace WireMock.Serialization
            return funcs.Select(Map).Where(x => x != null).ToArray();
        }

-        public static string Map<T>([CanBeNull] Func<T, bool> func)
+        private static string Map<T>([CanBeNull] Func<T, bool> func)
        {
            return func?.ToString();
        }
--- a/src/WireMock.Net/Server/FluentMockServer.Admin.cs
+++ b/src/WireMock.Net/Server/FluentMockServer.Admin.cs
@@ -2,23 +2,24 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Http;
 using System.Text;
+using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Requests;
 using WireMock.Admin.Settings;
+using WireMock.Http;
 using WireMock.Logging;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
+using WireMock.Serialization;
+using WireMock.Settings;
 using WireMock.Util;
 using WireMock.Validation;
-using WireMock.Http;
-using System.Threading.Tasks;
-using WireMock.Settings;
-using WireMock.Serialization;

 namespace WireMock.Server
 {
@@ -129,23 +130,31 @@ namespace WireMock.Server
        }

        #region Proxy and Record
-        private void InitProxyAndRecord(ProxyAndRecordSettings settings)
+        private HttpClient _httpClientForProxy;
+
+        private void InitProxyAndRecord(IProxyAndRecordSettings settings)
        {
+            _httpClientForProxy = HttpClientHelper.CreateHttpClient(settings.X509Certificate2ThumbprintOrSubjectName);
            Given(Request.Create().WithPath("/*").UsingAnyVerb()).RespondWith(new ProxyAsyncResponseProvider(ProxyAndRecordAsync, settings));
        }

-        private async Task<ResponseMessage> ProxyAndRecordAsync(RequestMessage requestMessage, ProxyAndRecordSettings settings)
+        private async Task<ResponseMessage> ProxyAndRecordAsync(RequestMessage requestMessage, IProxyAndRecordSettings settings)
        {
            var requestUri = new Uri(requestMessage.Url);
            var proxyUri = new Uri(settings.Url);
            var proxyUriWithRequestPathAndQuery = new Uri(proxyUri, requestUri.PathAndQuery);

-            var responseMessage = await HttpClientHelper.SendAsync(requestMessage, proxyUriWithRequestPathAndQuery.AbsoluteUri, settings.X509Certificate2ThumbprintOrSubjectName);
+            var responseMessage = await HttpClientHelper.SendAsync(_httpClientForProxy, requestMessage, proxyUriWithRequestPathAndQuery.AbsoluteUri);

            if (settings.SaveMapping)
            {
                var mapping = ToMapping(requestMessage, responseMessage);
-                SaveMappingToFile(mapping);
+                _options.Mappings.Add(mapping);
+
+                if (settings.SaveMappingToFile)
+                {
+                    SaveMappingToFile(mapping);
+                }
            }

            return responseMessage;
@@ -153,11 +162,20 @@ namespace WireMock.Server

        private Mapping ToMapping(RequestMessage requestMessage, ResponseMessage responseMessage)
        {
-            var request = (Request)Request.Create();
+            var request = Request.Create();
            request.WithPath(requestMessage.Path);
            request.UsingVerb(requestMessage.Method);

-            var response = (Response)Response.Create(responseMessage);
+            requestMessage.Query.Loop((key, value) => request.WithParam(key, value.ToArray()));
+            requestMessage.Headers.Loop((key, value) => request.WithHeader(key, value.ToArray()));
+            requestMessage.Cookies.Loop((key, value) => request.WithCookie(key, value));
+
+            if (requestMessage.Body != null)
+            {
+                request.WithBody(new ExactMatcher(requestMessage.Body));
+            }
+
+            var response = Response.Create(responseMessage);

            return new Mapping(Guid.NewGuid(), string.Empty, request, response, 0, null, null, null);
        }
@@ -416,6 +434,8 @@ namespace WireMock.Server
                    Body = logEntry.ResponseMessage.Body,
                    BodyAsBytes = logEntry.ResponseMessage.BodyAsBytes,
                    BodyOriginal = logEntry.ResponseMessage.BodyOriginal,
+                    BodyAsFile = logEntry.ResponseMessage.BodyAsFile,
+                    BodyAsFileIsCached = logEntry.ResponseMessage.BodyAsFileIsCached,
                    Headers = logEntry.ResponseMessage.Headers,
                    BodyEncoding = logEntry.ResponseMessage.BodyEncoding != null ? new EncodingModel
                    {
@@ -466,7 +486,7 @@ namespace WireMock.Server
                }
            }

-            var result = dict.OrderBy(x => x.Value.AverageTotalScore).Select(x => x.Key);
+            var result = dict.OrderBy(x => x.Value.AverageTotalScore).Select(x => x.Key).Select(ToLogEntryModel);

            return ToJson(result);
        }
@@ -517,12 +537,16 @@ namespace WireMock.Server
            {
                string path = requestModel.Path as string;
                if (path != null)
+                {
                    requestBuilder = requestBuilder.WithPath(path);
+                }
                else
                {
                    var pathModel = JsonUtils.ParseJTokenToObject<PathModel>(requestModel.Path);
                    if (pathModel?.Matchers != null)
+                    {
                        requestBuilder = requestBuilder.WithPath(pathModel.Matchers.Select(MappingConverter.Map).ToArray());
+                    }
                }
            }

@@ -530,17 +554,23 @@ namespace WireMock.Server
            {
                string url = requestModel.Url as string;
                if (url != null)
+                {
                    requestBuilder = requestBuilder.WithUrl(url);
+                }
                else
                {
                    var urlModel = JsonUtils.ParseJTokenToObject<UrlModel>(requestModel.Url);
                    if (urlModel?.Matchers != null)
+                    {
                        requestBuilder = requestBuilder.WithUrl(urlModel.Matchers.Select(MappingConverter.Map).ToArray());
+                    }
                }
            }

            if (requestModel.Methods != null)
+            {
                requestBuilder = requestBuilder.UsingVerb(requestModel.Methods);
+            }

            if (requestModel.Headers != null)
            {
@@ -601,7 +631,12 @@ namespace WireMock.Server

            if (responseModel.Headers != null)
            {
-                responseBuilder = responseBuilder.WithHeaders(responseModel.Headers);
+                foreach (var entry in responseModel.Headers)
+                {
+                    responseBuilder = entry.Value is string value ?
+                        responseBuilder.WithHeader(entry.Key, value) :
+                        responseBuilder.WithHeader(entry.Key, JsonUtils.ParseJTokenToObject<string[]>(entry.Value));
+                }
            }
            else if (responseModel.HeadersRaw != null)
            {
@@ -645,7 +680,7 @@ namespace WireMock.Server
            {
                Body = JsonConvert.SerializeObject(result, _settings),
                StatusCode = 200,
-                Headers = new Dictionary<string, string> { { "Content-Type", "application/json" } }
+                Headers = new Dictionary<string, WireMockList<string>> { { "Content-Type", new WireMockList<string>("application/json") } }
            };
        }

--- a/src/WireMock.Net/Server/FluentMockServer.cs
+++ b/src/WireMock.Net/Server/FluentMockServer.cs
@@ -25,12 +25,15 @@ namespace WireMock.Server
        private readonly IOwinSelfHost _httpServer;
        private readonly WireMockMiddlewareOptions _options = new WireMockMiddlewareOptions();

+        /// <summary>
+        /// Gets a value indicating whether this server is started.
+        /// </summary>
+        [PublicAPI]
+        public bool IsStarted { get; }
+
        /// <summary>
        /// Gets the ports.
        /// </summary>
-        /// <value>
-        /// The ports.
-        /// </value>
        [PublicAPI]
        public List<int> Ports { get; }

@@ -59,7 +62,7 @@ namespace WireMock.Server
        /// <param name="settings">The FluentMockServerSettings.</param>
        /// <returns>The <see cref="FluentMockServer"/>.</returns>
        [PublicAPI]
-        public static FluentMockServer Start(FluentMockServerSettings settings)
+        public static FluentMockServer Start(IFluentMockServerSettings settings)
        {
            Check.NotNull(settings, nameof(settings));

@@ -150,7 +153,7 @@ namespace WireMock.Server
            });
        }

-        private FluentMockServer(FluentMockServerSettings settings)
+        private FluentMockServer(IFluentMockServerSettings settings)
        {
            if (settings.Urls != null)
            {
@@ -170,6 +173,8 @@ namespace WireMock.Server
 #else
            _httpServer = new OwinSelfHost(_options, Urls);
 #endif
+            IsStarted = _httpServer.IsStarted;
+
            Ports = _httpServer.Ports;

            _httpServer.StartAsync();
@@ -363,18 +368,18 @@ namespace WireMock.Server
            return new RespondWithAProvider(RegisterMapping, requestMatcher);
        }

-        /// <summary>
-        /// The register mapping.
-        /// </summary>
-        /// <param name="mapping">
-        /// The mapping.
-        /// </param>
        private void RegisterMapping(Mapping mapping)
        {
-            // Check a mapping exists with the same GUID, if so, remove it first.
-            DeleteMapping(mapping.Guid);
-
-            _options.Mappings.Add(mapping);
+            // Check a mapping exists with the same Guid, if so, replace it.
+            var existingMapping = _options.Mappings.FirstOrDefault(m => m.Guid == mapping.Guid);
+            if (existingMapping != null)
+            {
+                _options.Mappings[_options.Mappings.IndexOf(existingMapping)] = mapping;
+            }
+            else
+            {
+                _options.Mappings.Add(mapping);
+            }
        }
    }
 }
--- a/src/WireMock.Net/Settings/FluentMockServerSettings.cs
+++ b/src/WireMock.Net/Settings/FluentMockServerSettings.cs
@@ -6,91 +6,62 @@ namespace WireMock.Settings
    /// <summary>
    /// FluentMockServerSettings
    /// </summary>
-    public class FluentMockServerSettings
+    public class FluentMockServerSettings : IFluentMockServerSettings
    {
-        /// <summary>
-        /// Gets or sets the port.
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.Port"/>
        [PublicAPI]
        public int? Port { get; set; }

-        /// <summary>
-        /// Gets or sets the use SSL.
-        /// </summary>
-        // ReSharper disable once InconsistentNaming
+        /// <inheritdoc cref="IFluentMockServerSettings.UseSSL"/>
        [PublicAPI]
+        // ReSharper disable once InconsistentNaming
        public bool? UseSSL { get; set; }

-        /// <summary>
-        /// Gets or sets wether to start admin interface.
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.StartAdminInterface"/>
        [PublicAPI]
        public bool? StartAdminInterface { get; set; }

-        /// <summary>
-        /// Gets or sets if the static mappings should be read at startup.
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.ReadStaticMappings"/>
        [PublicAPI]
        public bool? ReadStaticMappings { get; set; }

-        /// <summary>
-        /// Gets or sets if the server should record and save requests and responses.
-        /// </summary>
-        /// <value>true/false</value>
+        /// <inheritdoc cref="IFluentMockServerSettings.ProxyAndRecordSettings"/>
        [PublicAPI]
-        public ProxyAndRecordSettings ProxyAndRecordSettings { get; set; }
+        public IProxyAndRecordSettings ProxyAndRecordSettings { get; set; }

-        /// <summary>
-        /// Gets or sets the urls.
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.Urls"/>
        [PublicAPI]
        public string[] Urls { get; set; }

-        /// <summary>
-        /// StartTimeout
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.StartTimeout"/>
        [PublicAPI]
        public int StartTimeout { get; set; } = 10000;

-        /// <summary>
-        /// Allow Partial Mapping (default set to false).
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.AllowPartialMapping"/>
        [PublicAPI]
        public bool? AllowPartialMapping { get; set; }

-        /// <summary>
-        /// The username needed for __admin access.
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.AdminUsername"/>
        [PublicAPI]
        public string AdminUsername { get; set; }

-        /// <summary>
-        /// The password needed for __admin access.
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.AdminPassword"/>
        [PublicAPI]
        public string AdminPassword { get; set; }

-        /// <summary>
-        /// The RequestLog expiration in hours (optional).
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.RequestLogExpirationDuration"/>
        [PublicAPI]
        public int? RequestLogExpirationDuration { get; set; }

-        /// <summary>
-        /// The MaxRequestLog count (optional).
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.MaxRequestLogCount"/>
        [PublicAPI]
        public int? MaxRequestLogCount { get; set; }

-        /// <summary>
-        /// Action which is called (with the IAppBuilder or IApplicationBuilder) before the internal WireMockMiddleware is initialized. [Optional]
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.PreWireMockMiddlewareInit"/>
        [PublicAPI]
        public Action<object> PreWireMockMiddlewareInit { get; set; }

-        /// <summary>
-        /// Action which is called (with the IAppBuilder or IApplicationBuilder) after the internal WireMockMiddleware is initialized. [Optional]
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.PostWireMockMiddlewareInit"/>
        [PublicAPI]
        public Action<object> PostWireMockMiddlewareInit { get; set; }
    }
--- a/src/WireMock.Net/Settings/IFluentMockServerSettings.cs
+++ b/src/WireMock.Net/Settings/IFluentMockServerSettings.cs
@@ -0,0 +1,81 @@
+using System;
+
+namespace WireMock.Settings
+{
+    /// <summary>
+    /// IFluentMockServerSettings
+    /// </summary>
+    public interface IFluentMockServerSettings
+    {
+        /// <summary>
+        /// Gets or sets the port.
+        /// </summary>
+        int? Port { get; set; }
+
+        /// <summary>
+        /// Gets or sets the use SSL.
+        /// </summary>
+        // ReSharper disable once InconsistentNaming
+        bool? UseSSL { get; set; }
+
+        /// <summary>
+        /// Gets or sets wether to start admin interface.
+        /// </summary>
+        bool? StartAdminInterface { get; set; }
+
+        /// <summary>
+        /// Gets or sets if the static mappings should be read at startup.
+        /// </summary>
+        bool? ReadStaticMappings { get; set; }
+
+        /// <summary>
+        /// Gets or sets if the proxy and record settings.
+        /// </summary>
+        IProxyAndRecordSettings ProxyAndRecordSettings { get; set; }
+
+        /// <summary>
+        /// Gets or sets the urls.
+        /// </summary>
+        string[] Urls { get; set; }
+
+        /// <summary>
+        /// StartTimeout
+        /// </summary>
+        int StartTimeout { get; set; }
+
+        /// <summary>
+        /// Allow Partial Mapping (default set to false).
+        /// </summary>
+        bool? AllowPartialMapping { get; set; }
+
+        /// <summary>
+        /// The username needed for __admin access.
+        /// </summary>
+        string AdminUsername { get; set; }
+
+        /// <summary>
+        /// The password needed for __admin access.
+        /// </summary>
+        string AdminPassword { get; set; }
+
+        /// <summary>
+        /// The RequestLog expiration in hours (optional).
+        /// </summary>
+        int? RequestLogExpirationDuration { get; set; }
+
+        /// <summary>
+        /// The MaxRequestLog count (optional).
+        /// </summary>
+        int? MaxRequestLogCount { get; set; }
+
+        /// <summary>
+        /// Action which is called (with the IAppBuilder or IApplicationBuilder) before the internal WireMockMiddleware is initialized. [Optional]
+        /// </summary>
+        Action<object> PreWireMockMiddlewareInit { get; set; }
+
+        /// <summary>
+        /// Action which is called (with the IAppBuilder or IApplicationBuilder) after the internal WireMockMiddleware is initialized. [Optional]
+        /// </summary>
+        Action<object> PostWireMockMiddlewareInit { get; set; }
+    }
+}
--- a/src/WireMock.Net/Settings/IProxyAndRecordSettings.cs
+++ b/src/WireMock.Net/Settings/IProxyAndRecordSettings.cs
@@ -0,0 +1,28 @@
+namespace WireMock.Settings
+{
+    /// <summary>
+    /// IRecordAndSaveSettings
+    /// </summary>
+    public interface IProxyAndRecordSettings
+    {
+        /// <summary>
+        /// The URL to proxy.
+        /// </summary>
+        string Url { get; set; }
+
+        /// <summary>
+        /// Save the mapping for each request/response to the internal Mappings.
+        /// </summary>
+        bool SaveMapping { get; set; }
+
+        /// <summary>
+        /// Save the mapping for each request/response to also file. (Note that SaveMapping must also be set to true.)
+        /// </summary>
+        bool SaveMappingToFile { get; set; }
+
+        /// <summary>
+        /// The clientCertificate thumbprint or subject name fragment to use. Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
+        /// </summary>
+        string X509Certificate2ThumbprintOrSubjectName { get; set; }
+    }
+}
--- a/src/WireMock.Net/Settings/ProxyAndRecordSettings.cs
+++ b/src/WireMock.Net/Settings/ProxyAndRecordSettings.cs
@@ -1,23 +1,26 @@
-namespace WireMock.Settings
+using JetBrains.Annotations;
+
+namespace WireMock.Settings
 {
    /// <summary>
    /// RecordAndSaveSettings
    /// </summary>
-    public class ProxyAndRecordSettings
+    public class ProxyAndRecordSettings : IProxyAndRecordSettings
    {
-        /// <summary>
-        /// The URL to proxy.
-        /// </summary>
+        /// <inheritdoc cref="IProxyAndRecordSettings.Url"/>
+        [PublicAPI]
        public string Url { get; set; }

-        /// <summary>
-        /// Save the mapping for each request/response.
-        /// </summary>
+        /// <inheritdoc cref="IProxyAndRecordSettings.SaveMapping"/>
+        [PublicAPI]
        public bool SaveMapping { get; set; } = true;

-        /// <summary>
-        /// The clientCertificate thumbprint or subject name fragment to use. Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
-        /// </summary>
+        /// <inheritdoc cref="IProxyAndRecordSettings.SaveMappingToFile"/>
+        [PublicAPI]
+        public bool SaveMappingToFile { get; set; } = true;
+
+        /// <inheritdoc cref="IProxyAndRecordSettings.X509Certificate2ThumbprintOrSubjectName"/>
+        [PublicAPI]
        public string X509Certificate2ThumbprintOrSubjectName { get; set; }
    }
 }
--- a/src/WireMock.Net/Transformers/ResponseMessageTransformer.cs
+++ b/src/WireMock.Net/Transformers/ResponseMessageTransformer.cs
@@ -1,5 +1,7 @@
-using HandlebarsDotNet;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Linq;
+using HandlebarsDotNet;
+using WireMock.Util;

 namespace WireMock.Transformers
 {
@@ -16,13 +18,16 @@ namespace WireMock.Transformers
            responseMessage.Body = templateBody(template);

            // Headers
-            var newHeaders = new Dictionary<string, string>();
+            var newHeaders = new Dictionary<string, WireMockList<string>>();
            foreach (var header in original.Headers)
            {
                var templateHeaderKey = Handlebars.Compile(header.Key);
-                var templateHeaderValue = Handlebars.Compile(header.Value);
+                var templateHeaderValues = header.Value
+                    .Select(Handlebars.Compile)
+                    .Select(func => func(template))
+                    .ToArray();

-                newHeaders.Add(templateHeaderKey(template), templateHeaderValue(template));
+                newHeaders.Add(templateHeaderKey(template), new WireMockList<string>(templateHeaderValues));
            }

            responseMessage.Headers = newHeaders;
--- a/src/WireMock.Net/Util/ConcurentObservableCollection.cs
+++ b/src/WireMock.Net/Util/ConcurentObservableCollection.cs
@@ -0,0 +1,77 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace WireMock.Util
+{
+    /// <summary>
+    /// A special Collection that overrides methods of <see cref="ObservableCollection{T}"/> to make them thread safe
+    /// </summary>
+    /// <typeparam name="T">The type of elements in the collection.</typeparam>
+    /// <inheritdoc cref="ObservableCollection{T}" />
+    public class ConcurentObservableCollection<T> : ObservableCollection<T>
+    {
+        private readonly object _lockObject = new object();
+
+        /// <summary> 
+        /// Initializes a new instance of the <see cref="T:WireMock.Util.ConcurentObservableCollection`1" /> class. 
+        /// </summary> 
+        public ConcurentObservableCollection() { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConcurentObservableCollection{T}"/> class that contains elements copied from the specified list.
+        /// </summary>
+        /// <param name="list">The list from which the elements are copied.</param>
+        public ConcurentObservableCollection(List<T> list) : base(list) { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConcurentObservableCollection{T}"/> class that contains elements copied from the specified collection.
+        /// </summary>
+        /// <param name="collection">The collection from which the elements are copied.</param>
+        public ConcurentObservableCollection(IEnumerable<T> collection) : base(collection) { }
+
+        /// <inheritdoc cref="ObservableCollection{T}.ClearItems"/>
+        protected override void ClearItems()
+        {
+            lock (_lockObject)
+            {
+                base.ClearItems();
+            }
+        }
+
+        /// <inheritdoc cref="ObservableCollection{T}.RemoveItem"/>
+        protected override void RemoveItem(int index)
+        {
+            lock (_lockObject)
+            {
+                base.RemoveItem(index);
+            }
+        }
+
+        /// <inheritdoc cref="ObservableCollection{T}.InsertItem"/>
+        protected override void InsertItem(int index, T item)
+        {
+            lock (_lockObject)
+            {
+                base.InsertItem(index, item);
+            }
+        }
+
+        /// <inheritdoc cref="ObservableCollection{T}.SetItem"/>
+        protected override void SetItem(int index, T item)
+        {
+            lock (_lockObject)
+            {
+                base.SetItem(index, item);
+            }
+        }
+
+        /// <inheritdoc cref="ObservableCollection{T}.MoveItem"/>
+        protected override void MoveItem(int oldIndex, int newIndex)
+        {
+            lock (_lockObject)
+            {
+                base.MoveItem(oldIndex, newIndex);
+            }
+        }
+    }
+}
--- a/src/WireMock.Net/Util/DictionaryExtensions.cs
+++ b/src/WireMock.Net/Util/DictionaryExtensions.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
+using WireMock.Validation;
+
+namespace WireMock.Util
+{
+    /// <summary>
+    /// Some IDictionary Extensions
+    /// </summary>
+    public static class DictionaryExtensions
+    {
+        /// <summary>
+        /// Loops the dictionary and executes the specified action.
+        /// </summary>
+        /// <typeparam name="TKey">The type of the key.</typeparam>
+        /// <typeparam name="TValue">The type of the value.</typeparam>
+        /// <param name="dictionary">The dictionary to loop (can be null).</param>
+        /// <param name="action">The action.</param>
+        public static void Loop<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, [NotNull] Action<TKey, TValue> action)
+        {
+            Check.NotNull(action, nameof(action));
+
+            if (dictionary != null)
+            {
+                foreach (var entry in dictionary)
+                {
+                    action(entry.Key, entry.Value);
+                }
+            }
+        }
+    }
+}
--- a/src/WireMock.Net/Util/JsonUtils.cs
+++ b/src/WireMock.Net/Util/JsonUtils.cs
@@ -7,13 +7,12 @@ namespace WireMock.Util
        public static T ParseJTokenToObject<T>(object value)
        {
            if (value == null)
+            {
                return default(T);
+            }

-            JToken token = value as JToken;
-            if (token == null)
-                return default(T);
-
-            return token.ToObject<T>();
+            var token = value as JToken;
+            return token == null ? default(T) : token.ToObject<T>();
        }
    }
 }
--- a/src/WireMock.Net/Util/NamedReaderWriterLocker.cs
+++ b/src/WireMock.Net/Util/NamedReaderWriterLocker.cs
@@ -74,8 +74,7 @@ namespace WireMock.Util

        public void RemoveLock(string name)
        {
-            ReaderWriterLockSlim o;
-            _lockDict.TryRemove(name, out o);
+            _lockDict.TryRemove(name, out _);
        }
    }
 }
--- a/src/WireMock.Net/Util/WireMockList.cs
+++ b/src/WireMock.Net/Util/WireMockList.cs
@@ -36,9 +36,6 @@ namespace WireMock.Util
        /// <summary>
        /// Returns a <see cref="string" /> that represents this instance.
        /// </summary>
-        /// <returns>
-        /// A <see cref="string" /> that represents this instance.
-        /// </returns>
        public override string ToString()
        {
            if (this != null && this.Any())
--- a/src/WireMock.Net/WireMock.Net.csproj
+++ b/src/WireMock.Net/WireMock.Net.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
    <AssemblyTitle>WireMock.Net</AssemblyTitle>
-    <Version>1.0.2.5</Version>
+    <Version>1.0.2.12</Version>
    <Authors>Alexandre Victoor;Stef Heyenrath</Authors>
    <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -17,9 +17,11 @@
    <RepositoryType>git</RepositoryType>
    <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <DebugType>portable</DebugType>
    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
    <RootNamespace>WireMock</RootNamespace>
+    <DebugType>full</DebugType> 
+    <IncludeSource>True</IncludeSource>
+    <IncludeSymbols>True</IncludeSymbols>
  </PropertyGroup>

  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0'">
@@ -32,9 +34,9 @@
    </PackageReference>
    <PackageReference Include="Handlebars.Net" Version="1.9.0" />
    <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
-    <PackageReference Include="SimMetrics.Net" Version="1.0.3" />
-    <PackageReference Include="System.Net.Http" Version="4.3.2" />
-    <PackageReference Include="RestEase" Version="1.4.2" />
+    <PackageReference Include="SimMetrics.Net" Version="1.0.4" />
+    <PackageReference Include="System.Net.Http" Version="4.3.3" />
+    <PackageReference Include="RestEase" Version="1.4.4" />
  </ItemGroup>

  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
@@ -49,7 +51,7 @@
  </ItemGroup>

  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.5" />
    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
    <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
  </ItemGroup>
--- a/test/WireMock.Net.Tests/ClientTests.cs
+++ b/test/WireMock.Net.Tests/ClientTests.cs
@@ -0,0 +1,48 @@
+using System.Linq;
+using System.Threading.Tasks;
+using NFluent;
+using RestEase;
+using WireMock.Admin.Mappings;
+using WireMock.Client;
+using WireMock.Server;
+using Xunit;
+
+namespace WireMock.Net.Tests
+{
+    public class ClientTests
+    {
+        [Fact]
+        public async Task Client_IFluentMockServerAdmin_PostMappingAsync()
+        {
+            // Assign
+            var server = FluentMockServer.StartWithAdminInterface();
+            var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);
+
+            // Act
+            var model = new MappingModel
+            {
+                Request = new RequestModel
+                {
+                    Path = "/1"
+                },
+                Response = new ResponseModel
+                {
+                    Body = "txt",
+                    StatusCode = 200
+                },
+                Priority = 500,
+                Title = "test"
+            };
+            string result = await api.PostMappingAsync(model);
+
+            // Assert
+            Check.That(result).IsNotNull();
+
+            var mapping = server.Mappings.Single(m => m.Priority == 500);
+            Check.That(mapping).IsNotNull();
+            Check.That(mapping.Title).Equals("test");
+
+            server.Stop();
+        }
+    }
+}
--- a/test/WireMock.Net.Tests/FluentMockServerAdminRestClientTests.cs
+++ b/test/WireMock.Net.Tests/FluentMockServerAdminRestClientTests.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using NFluent;
+using RestEase;
+using WireMock.Admin.Mappings;
+using WireMock.Client;
+using WireMock.Server;
+using WireMock.Settings;
+using Xunit;
+
+namespace WireMock.Net.Tests
+{
+    public class FluentMockServerAdminRestClientTests : IDisposable
+    {
+        public void Dispose()
+        {
+            _server?.Stop();
+        }
+
+        private FluentMockServer _server;
+
+        [Fact]
+        public async Task IFluentMockServerAdmin_FindRequestsAsync()
+        {
+            // given
+            _server = FluentMockServer.Start(new FluentMockServerSettings { StartAdminInterface = true });
+            var serverUrl = "http://localhost:" + _server.Ports[0];
+            await new HttpClient().GetAsync(serverUrl + "/foo");
+            var api = RestClient.For<IFluentMockServerAdmin>(serverUrl);
+
+            // when
+            var requests = await api.FindRequestsAsync(new RequestModel { Methods = new[] { "get" } });
+
+            // then
+            Check.That(requests).HasSize(1);
+            var requestLogged = requests.First();
+            Check.That(requestLogged.Request.Method).IsEqualTo("get");
+            Check.That(requestLogged.Request.Body).IsNull();
+            Check.That(requestLogged.Request.Path).IsEqualTo("/foo");
+        }
+
+        [Fact]
+        public async Task IFluentMockServerAdmin_GetRequestsAsync()
+        {
+            // given
+            _server = FluentMockServer.Start(new FluentMockServerSettings { StartAdminInterface = true });
+            var serverUrl = "http://localhost:" + _server.Ports[0];
+            await new HttpClient().GetAsync(serverUrl + "/foo");
+            var api = RestClient.For<IFluentMockServerAdmin>(serverUrl);
+
+            // when
+            var requests = await api.GetRequestsAsync();
+
+            // then
+            Check.That(requests).HasSize(1);
+            var requestLogged = requests.First();
+            Check.That(requestLogged.Request.Method).IsEqualTo("get");
+            Check.That(requestLogged.Request.Body).IsNull();
+            Check.That(requestLogged.Request.Path).IsEqualTo("/foo");
+        }
+    }
+}
--- a/test/WireMock.Net.Tests/FluentMockServerTests.Proxy.cs
+++ b/test/WireMock.Net.Tests/FluentMockServerTests.Proxy.cs
@@ -0,0 +1,157 @@
+using System;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using NFluent;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+using Xunit;
+
+namespace WireMock.Net.Tests
+{
+    public partial class FluentMockServerTests
+    {
+        private FluentMockServer _serverForProxyForwarding;
+
+        [Fact]
+        public async Task FluentMockServer_Should_proxy_responses()
+        {
+            // given
+            _server = FluentMockServer.Start();
+            _server
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create().WithProxy("http://www.google.com"));
+
+            // when
+            var result = await new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + "/search?q=test");
+
+            // then
+            Check.That(result).Contains("google");
+        }
+
+        [Fact]
+        public async Task FluentMockServer_Should_preserve_content_header_in_proxied_request()
+        {
+            // given
+            _serverForProxyForwarding = FluentMockServer.Start();
+            _serverForProxyForwarding
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create());
+
+            _server = FluentMockServer.Start();
+            _server
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create().WithProxy(_serverForProxyForwarding.Urls[0]));
+
+            // when
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Post,
+                RequestUri = new Uri(_server.Urls[0]),
+                Content = new StringContent("stringContent")
+            };
+            requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain");
+            await new HttpClient().SendAsync(requestMessage);
+
+            // then
+            var receivedRequest = _serverForProxyForwarding.LogEntries.First().RequestMessage;
+            Check.That(receivedRequest.Body).IsEqualTo("stringContent");
+            Check.That(receivedRequest.Headers).ContainsKey("Content-Type");
+            Check.That(receivedRequest.Headers["Content-Type"]).ContainsExactly("text/plain");
+        }
+
+        [Fact]
+        public async Task FluentMockServer_Should_preserve_content_header_in_proxied_response()
+        {
+            // given
+            _serverForProxyForwarding = FluentMockServer.Start();
+            _serverForProxyForwarding
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create()
+                    .WithBody("body")
+                    .WithHeader("Content-Type", "text/plain"));
+
+            _server = FluentMockServer.Start();
+            _server
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create().WithProxy(_serverForProxyForwarding.Urls[0]));
+
+            // when
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Get,
+                RequestUri = new Uri(_server.Urls[0])
+            };
+            var response = await new HttpClient().SendAsync(requestMessage);
+
+            // then
+            Check.That(await response.Content.ReadAsStringAsync()).IsEqualTo("body");
+            Check.That(response.Content.Headers.Contains("Content-Type")).IsTrue();
+            Check.That(response.Content.Headers.GetValues("Content-Type")).ContainsExactly("text/plain");
+        }
+
+        [Fact]
+        public async Task FluentMockServer_Should_change_absolute_location_header_in_proxied_response()
+        {
+            // given
+            _serverForProxyForwarding = FluentMockServer.Start();
+            _serverForProxyForwarding
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create()
+                    .WithStatusCode(HttpStatusCode.Redirect)
+                    .WithHeader("Location", _serverForProxyForwarding.Urls[0] + "testpath"));
+
+            _server = FluentMockServer.Start();
+            _server
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create().WithProxy(_serverForProxyForwarding.Urls[0]));
+
+            // when
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Get,
+                RequestUri = new Uri(_server.Urls[0])
+            };
+            var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
+            var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage);
+
+            // then
+            Check.That(response.Headers.Contains("Location")).IsTrue();
+            Check.That(response.Headers.GetValues("Location")).ContainsExactly(_server.Urls[0] + "testpath");
+        }
+
+        [Fact]
+        public async Task FluentMockServer_Should_preserve_cookie_header_in_proxied_request()
+        {
+            // given
+            _serverForProxyForwarding = FluentMockServer.Start();
+            _serverForProxyForwarding
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create());
+
+            _server = FluentMockServer.Start();
+            _server
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create().WithProxy(_serverForProxyForwarding.Urls[0]));
+
+            // when
+            var requestUri = new Uri(_server.Urls[0]);
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Get,
+                RequestUri = requestUri
+            };
+            var clientHandler = new HttpClientHandler();
+            clientHandler.CookieContainer.Add(requestUri, new Cookie("name", "value"));
+            await new HttpClient(clientHandler).SendAsync(requestMessage);
+
+            // then
+            var receivedRequest = _serverForProxyForwarding.LogEntries.First().RequestMessage;
+            Check.That(receivedRequest.Cookies).IsNotNull();
+            Check.That(receivedRequest.Cookies).ContainsPair("name", "value");
+        }
+    }
+}
--- a/test/WireMock.Net.Tests/FluentMockServerTests.cs
+++ b/test/WireMock.Net.Tests/FluentMockServerTests.cs
@@ -6,17 +6,15 @@ using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using NFluent;
-using Xunit;
 using WireMock.Matchers;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
+using Xunit;

 namespace WireMock.Net.Tests
 {
-    //[TestFixture]
-    //[Timeout(5000)]
-    public class FluentMockServerTests : IDisposable
+    public partial class FluentMockServerTests : IDisposable
    {
        private FluentMockServer _server;

@@ -119,20 +117,24 @@ namespace WireMock.Net.Tests
            var guid = Guid.Parse("90356dba-b36c-469a-a17e-669cd84f1f05");
            _server = FluentMockServer.Start();

-            _server.Given(Request.Create().WithPath("/1").UsingGet())
+            var response1 = Response.Create().WithStatusCode(500);
+            _server.Given(Request.Create().UsingGet())
                .WithGuid(guid)
-                .RespondWith(Response.Create().WithStatusCode(500));
+                .RespondWith(response1);

-            var mappings = _server.Mappings.ToArray();
-            Check.That(mappings).HasSize(1);
-            Check.That(mappings.First().Guid).Equals(guid);
+            var mappings1 = _server.Mappings.ToArray();
+            Check.That(mappings1).HasSize(1);
+            Check.That(mappings1.First().Guid).Equals(guid);

+            var response2 = Response.Create().WithStatusCode(400);
            _server.Given(Request.Create().WithPath("/2").UsingGet())
                .WithGuid(guid)
-                .RespondWith(Response.Create().WithStatusCode(500));
+                .RespondWith(response2);

-            Check.That(mappings).HasSize(1);
-            Check.That(mappings.First().Guid).Equals(guid);
+            var mappings2 = _server.Mappings.ToArray();
+            Check.That(mappings2).HasSize(1);
+            Check.That(mappings2.First().Guid).Equals(guid);
+            Check.That(mappings2.First().Provider).Equals(response2);
        }

        [Fact]
@@ -178,7 +180,35 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_respond_to_request_bodyAsString()
+        public async Task FluentMockServer_Should_respond_to_request_methodPatch()
+        {
+            // given
+            _server = FluentMockServer.Start();
+
+            _server.Given(Request.Create().WithPath("/foo").UsingVerb("patch"))
+                .RespondWith(Response.Create().WithBody("hello patch"));
+
+            // when
+            var msg = new HttpRequestMessage(new HttpMethod("patch"), new Uri("http://localhost:" + _server.Ports[0] + "/foo"))
+            {
+                Content = new StringContent("{\"data\": {\"attr\":\"value\"}}")
+            };
+            var response = await new HttpClient().SendAsync(msg);
+
+            // then
+            Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.OK);
+            var responseBody = await response.Content.ReadAsStringAsync();
+            Check.That(responseBody).IsEqualTo("hello patch");
+
+            Check.That(_server.LogEntries).HasSize(1);
+            var requestLogged = _server.LogEntries.First();
+            Check.That(requestLogged.RequestMessage.Method).IsEqualTo("patch");
+            Check.That(requestLogged.RequestMessage.Body).IsNotNull();
+            Check.That(requestLogged.RequestMessage.Body).IsEqualTo("{\"data\": {\"attr\":\"value\"}}");
+        }
+
+        [Fact]
+        public async Task FluentMockServer_Should_respond_to_request_bodyAsString()
        {
            // given
            _server = FluentMockServer.Start();
@@ -199,7 +229,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_respond_to_request_bodyAsBase64()
+        public async Task FluentMockServer_Should_respond_to_request_bodyAsBase64()
        {
            // given
            _server = FluentMockServer.Start();
@@ -214,7 +244,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_respond_to_request_bodyAsBytes()
+        public async Task FluentMockServer_Should_respond_to_request_bodyAsBytes()
        {
            // given
            _server = FluentMockServer.Start();
@@ -231,7 +261,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_respond_404_for_unexpected_request()
+        public async Task FluentMockServer_Should_respond_404_for_unexpected_request()
        {
            // given
            _server = FluentMockServer.Start();
@@ -245,7 +275,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_find_a_request_satisfying_a_request_spec()
+        public async Task FluentMockServer_Should_find_a_request_satisfying_a_request_spec()
        {
            // given
            _server = FluentMockServer.Start();
@@ -264,7 +294,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_reset_requestlogs()
+        public async Task FluentMockServer_Should_reset_requestlogs()
        {
            // given
            _server = FluentMockServer.Start();
@@ -278,7 +308,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public void Should_reset_mappings()
+        public void FluentMockServer_Should_reset_mappings()
        {
            // given
            _server = FluentMockServer.Start();
@@ -300,7 +330,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_respond_a_redirect_without_body()
+        public async Task FluentMockServer_Should_respond_a_redirect_without_body()
        {
            // given
            _server = FluentMockServer.Start();
@@ -328,7 +358,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_delay_responses_for_a_given_route()
+        public async Task FluentMockServer_Should_delay_responses_for_a_given_route()
        {
            // given
            _server = FluentMockServer.Start();
@@ -351,7 +381,7 @@ namespace WireMock.Net.Tests
        }

        [Fact]
-        public async Task Should_delay_responses()
+        public async Task FluentMockServer_Should_delay_responses()
        {
            // given
            _server = FluentMockServer.Start();
@@ -370,22 +400,6 @@ namespace WireMock.Net.Tests
            Check.That(watch.ElapsedMilliseconds).IsStrictlyGreaterThan(200);
        }

-        [Fact]
-        public async Task Should_proxy_responses()
-        {
-            // given
-            _server = FluentMockServer.Start();
-            _server
-                .Given(Request.Create().WithPath("/*"))
-                .RespondWith(Response.Create().WithProxy("http://www.google.com"));
-
-            // when
-            var result = await new HttpClient().GetStringAsync("http://localhost:" + _server.Ports[0] + "/search?q=test");
-
-            // then
-            Check.That(result).Contains("google");
-        }
-
        //Leaving commented as this requires an actual certificate with password, along with a service that expects a client certificate
        //[Fact]
        //public async Task Should_proxy_responses_with_client_certificate()
@@ -429,6 +443,7 @@ namespace WireMock.Net.Tests
        public void Dispose()
        {
            _server?.Stop();
+            _serverForProxyForwarding?.Stop();
        }
    }
 }
--- a/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs
+++ b/test/WireMock.Net.Tests/ObservableLogEntriesTest.cs
@@ -1,5 +1,10 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
 using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
 using NFluent;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
@@ -8,7 +13,7 @@ using Xunit;

 namespace WireMock.Net.Tests
 {
-    public class ObservableLogEntriesTest: IDisposable
+    public class ObservableLogEntriesTest : IDisposable
    {
        private FluentMockServer _server;

@@ -35,6 +40,42 @@ namespace WireMock.Net.Tests
            Check.That(count).Equals(1);
        }

+        [Fact]
+        public async Task ParallelTest()
+        {
+            var expectedCount = 100;
+
+            // Assign
+            _server = FluentMockServer.Start();
+
+            _server
+                .Given(Request.Create()
+                    .WithPath("/foo")
+                    .UsingGet())
+                .RespondWith(Response.Create()
+                    .WithDelay(6)
+                    .WithSuccess());
+
+            int count = 0;
+            _server.LogEntriesChanged += (sender, args) => count++;
+
+            var http = new HttpClient();
+
+            // Act
+            var listOfTasks = new List<Task<HttpResponseMessage>>();
+            for (var i = 0; i < expectedCount; i++)
+            {
+                Thread.Sleep(3);
+                listOfTasks.Add(http.GetAsync(_server.Urls[0] + $"/foo"));
+            }
+            var responses = await Task.WhenAll(listOfTasks);
+            var countResponsesWithStatusNotOk = responses.Where(r => r.StatusCode != HttpStatusCode.OK).Count();
+
+            // Assert
+            Check.That(countResponsesWithStatusNotOk).Equals(0);
+            Check.That(count).Equals(expectedCount);
+        }
+
        public void Dispose()
        {
            _server?.Dispose();
--- a/test/WireMock.Net.Tests/RequestMessageTests.cs
+++ b/test/WireMock.Net.Tests/RequestMessageTests.cs
@@ -8,13 +8,13 @@ namespace WireMock.Net.Tests
    //[TestFixture]
    public class RequestMessageTests
    {
-        private const string clientIP = "::1";
+        private const string ClientIp = "::1";

        [Fact]
        public void Should_handle_empty_query()
        {
            // given
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp);

            // then
            Check.That(request.GetParameter("not_there")).IsNull();
@@ -26,7 +26,7 @@ namespace WireMock.Net.Tests
            // given
            string bodyAsString = "whatever";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost?foo=bar&multi=1&multi=2"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost?foo=bar&multi=1&multi=2"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            Check.That(request.GetParameter("foo")).Contains("bar");
--- a/test/WireMock.Net.Tests/RequestTests.ClientIP.cs
+++ b/test/WireMock.Net.Tests/RequestTests.ClientIP.cs
@@ -1,4 +1,3 @@
-
 using System;
 using NFluent;
 using WireMock.Matchers.Request;
--- a/test/WireMock.Net.Tests/RequestTests.PathAndMethod.cs
+++ b/test/WireMock.Net.Tests/RequestTests.PathAndMethod.cs
@@ -0,0 +1,113 @@
+using System;
+using System.Text;
+using NFluent;
+using Xunit;
+using WireMock.RequestBuilders;
+using WireMock.Matchers.Request;
+
+namespace WireMock.Net.Tests
+{
+    //[TestFixture]
+    public partial class RequestTests
+    {
+        [Fact]
+        public void Should_specify_requests_matching_given_path_and_method_delete()
+        {
+            // given
+            var spec = Request.Create().WithPath("/foo").UsingDelete();
+
+            // when
+            string bodyAsString = "whatever";
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "Delete", ClientIp, body, bodyAsString, Encoding.UTF8);
+
+            // then
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        }
+
+        [Fact]
+        public void Should_specify_requests_matching_given_path_and_method_get()
+        {
+            // given
+            var spec = Request.Create().WithPath("/foo").UsingGet();
+
+            // when
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "GET", ClientIp);
+
+            // then
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        }
+
+        [Fact]
+        public void Should_specify_requests_matching_given_path_and_method_head()
+        {
+            // given
+            var spec = Request.Create().WithPath("/foo").UsingHead();
+
+            // when
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "HEAD", ClientIp);
+
+            // then
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        }
+
+        [Fact]
+        public void Should_specify_requests_matching_given_path_and_method_post()
+        {
+            // given
+            var spec = Request.Create().WithPath("/foo").UsingPost();
+
+            // when
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp);
+
+            // then
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        }
+
+        [Fact]
+        public void Should_specify_requests_matching_given_path_and_method_put()
+        {
+            // given
+            var spec = Request.Create().WithPath("/foo").UsingPut();
+
+            // when
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp);
+
+            // then
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        }
+
+        [Fact]
+        public void Should_specify_requests_matching_given_path_and_method_patch()
+        {
+            // given
+            var spec = Request.Create().WithPath("/foo").UsingPatch();
+
+            // when
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PATCH", ClientIp);
+
+            // then
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        }
+
+        [Fact]
+        public void Should_exclude_requests_matching_given_path_but_not_http_method()
+        {
+            // given
+            var spec = Request.Create().WithPath("/foo").UsingPut();
+
+            // when
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "HEAD", ClientIp);
+
+            // then
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
+        }
+    }
+}
--- a/test/WireMock.Net.Tests/RequestTests.Url.cs
+++ b/test/WireMock.Net.Tests/RequestTests.Url.cs
@@ -0,0 +1,39 @@
+using System;
+using NFluent;
+using WireMock.Matchers.Request;
+using WireMock.RequestBuilders;
+using Xunit;
+
+namespace WireMock.Net.Tests
+{
+    public partial class RequestTests
+    {
+        [Fact]
+        public void Should_specify_requests_matching_given_url_wildcard()
+        {
+            // given
+            var spec = Request.Create().WithUrl("*/foo");
+
+            // when
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "blabla", ClientIp);
+
+            // then
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        }
+
+        [Fact]
+        public void Should_specify_requests_matching_given_url_exact()
+        {
+            // given
+            var spec = Request.Create().WithUrl("http://localhost/foo");
+
+            // when
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "blabla", ClientIp);
+
+            // then
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        }
+    }
+}
--- a/test/WireMock.Net.Tests/RequestTests.cs
+++ b/test/WireMock.Net.Tests/RequestTests.cs
@@ -12,7 +12,7 @@ namespace WireMock.Net.Tests
    //[TestFixture]
    public partial class RequestTests
    {
-        private const string clientIP = "::1";
+        private const string ClientIp = "::1";

        [Fact]
        public void Should_specify_requests_matching_given_path()
@@ -21,7 +21,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithPath("/foo");

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "blabla", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "blabla", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -33,8 +33,8 @@ namespace WireMock.Net.Tests
        {
            var requestBuilder = Request.Create().WithPath("/x1", "/x2");

-            var request1 = new RequestMessage(new Uri("http://localhost/x1"), "blabla", clientIP);
-            var request2 = new RequestMessage(new Uri("http://localhost/x2"), "blabla", clientIP);
+            var request1 = new RequestMessage(new Uri("http://localhost/x1"), "blabla", ClientIp);
+            var request2 = new RequestMessage(new Uri("http://localhost/x2"), "blabla", ClientIp);

            var requestMatchResult = new RequestMatchResult();
            Check.That(requestBuilder.GetMatchingScore(request1, requestMatchResult)).IsEqualTo(1.0);
@@ -48,7 +48,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithPath(url => url.EndsWith("/foo"));

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "blabla", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "blabla", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -62,7 +62,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithPath(new RegexMatcher("^/foo"));

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo/bar"), "blabla", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo/bar"), "blabla", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -76,107 +76,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithPath("/foo");

            // when
-            var request = new RequestMessage(new Uri("http://localhost/bar"), "blabla", clientIP);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
-        }
-
-        [Fact]
-        public void Should_specify_requests_matching_given_url()
-        {
-            // given
-            var spec = Request.Create().WithUrl("*/foo");
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "blabla", clientIP);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Fact]
-        public void Should_specify_requests_matching_given_path_and_method_put()
-        {
-            // given
-            var spec = Request.Create().WithPath("/foo").UsingPut();
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Fact]
-        public void Should_specify_requests_matching_given_path_and_method_post()
-        {
-            // given
-            var spec = Request.Create().WithPath("/foo").UsingPost();
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Fact]
-        public void Should_specify_requests_matching_given_path_and_method_get()
-        {
-            // given
-            var spec = Request.Create().WithPath("/foo").UsingGet();
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "GET", clientIP);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Fact]
-        public void Should_specify_requests_matching_given_path_and_method_delete()
-        {
-            // given
-            var spec = Request.Create().WithPath("/foo").UsingDelete();
-
-            // when
-            string bodyAsString = "whatever";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "Delete", clientIP, body, bodyAsString, Encoding.UTF8);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Fact]
-        public void Should_specify_requests_matching_given_path_and_method_head()
-        {
-            // given
-            var spec = Request.Create().WithPath("/foo").UsingHead();
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "HEAD", clientIP);
-
-            // then
-            var requestMatchResult = new RequestMatchResult();
-            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
-        }
-
-        [Fact]
-        public void Should_exclude_requests_matching_given_path_but_not_http_method()
-        {
-            // given
-            var spec = Request.Create().WithPath("/foo").UsingPut();
-
-            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "HEAD", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/bar"), "blabla", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -190,7 +90,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithPath("/bar").UsingPut();

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -206,7 +106,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "whatever";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "tata" } });
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string[]> { { "X-toto", new[] { "tata" } } });

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -222,7 +122,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "whatever";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "tata" } });
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string[]> { { "X-toto", new[] { "tata" } } });

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -238,7 +138,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "whatever";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "ABC" } });
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string[]> { { "X-toto", new[] { "ABC" } } });

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -254,7 +154,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "whatever";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "TaTa" } });
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string[]> { { "X-toto", new[] { "TaTa" } } });

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -268,7 +168,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().UsingAnyVerb().WithCookie("session", "a*");

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, null, null, null, null, new Dictionary<string, string> { { "session", "abc" } });
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, null, null, null, null, new Dictionary<string, string> { { "session", "abc" } });

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -284,7 +184,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "Hello world!";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -300,7 +200,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "cat";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -316,7 +216,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "cat";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -332,7 +232,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "caR";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -348,7 +248,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "The car drives in the street.";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -364,7 +264,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "Hello";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -380,7 +280,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "Hello world!";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "tatata" } });
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string[]> { { "X-toto", new[] { "tatata" } } });

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -396,7 +296,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "Hello world!";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -417,7 +317,7 @@ namespace WireMock.Net.Tests
                        <todo-item id='a3'>xyz</todo-item>
                    </todo-list>";
            byte[] body = Encoding.UTF8.GetBytes(xmlBodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, xmlBodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, xmlBodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -438,7 +338,7 @@ namespace WireMock.Net.Tests
                        <todo-item id='a3'>xyz</todo-item>
                    </todo-list>";
            byte[] body = Encoding.UTF8.GetBytes(xmlBodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, xmlBodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, xmlBodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -454,7 +354,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "{ \"things\": [ { \"name\": \"RequiredThing\" }, { \"name\": \"Wiremock\" } ] }";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -470,7 +370,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "{ \"things\": { \"name\": \"Wiremock\" } }";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -486,7 +386,7 @@ namespace WireMock.Net.Tests
            // when
            string bodyAsString = "xxx";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", clientIP, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "X-toto", "tatata" } });
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string[]> { { "X-toto", new[] { "tata" } } });

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -500,7 +400,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithParam("bar", "1", "2");

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo?bar=1&bar=2"), "PUT", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo?bar=1&bar=2"), "PUT", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -514,7 +414,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithParam("bar");

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo?bar"), "PUT", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo?bar"), "PUT", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -528,7 +428,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().UsingAnyVerb().WithParam(p => p.ContainsKey("bar"));

            // when
-            var request = new RequestMessage(new Uri("http://localhost/foo?bar=1&bar=2"), "PUT", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/foo?bar=1&bar=2"), "PUT", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
@@ -542,7 +442,7 @@ namespace WireMock.Net.Tests
            var spec = Request.Create().WithParam("bar", "1");

            // when
-            var request = new RequestMessage(new Uri("http://localhost/test=7"), "PUT", clientIP);
+            var request = new RequestMessage(new Uri("http://localhost/test=7"), "PUT", ClientIp);

            // then
            var requestMatchResult = new RequestMatchResult();
--- a/test/WireMock.Net.Tests/ResponseTests.Handlebars.cs
+++ b/test/WireMock.Net.Tests/ResponseTests.Handlebars.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using NFluent;
+using WireMock.ResponseBuilders;
+using Xunit;
+
+namespace WireMock.Net.Tests
+{
+    public partial class ResponseTests
+    {
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_UrlPathVerb()
+        {
+            // given
+            string bodyAsString = "abc";
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);
+
+            var response = Response.Create()
+                .WithBody("test {{request.url}} {{request.path}} {{request.method}}")
+                .WithTransformer();
+
+            // act
+            var responseMessage = await response.ProvideResponseAsync(request);
+
+            // then
+            Check.That(responseMessage.Body).Equals("test http://localhost/foo /foo post");
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_Query()
+        {
+            // given
+            string bodyAsString = "abc";
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
+            var request = new RequestMessage(new Uri("http://localhost/foo?a=1&a=2&b=5"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);
+
+            var response = Response.Create()
+                .WithBody("test keya={{request.query.a}} idx={{request.query.a.[0]}} idx={{request.query.a.[1]}} keyb={{request.query.b}}")
+                .WithTransformer();
+
+            // act
+            var responseMessage = await response.ProvideResponseAsync(request);
+
+            // then
+            Check.That(responseMessage.Body).Equals("test keya=1 idx=1 idx=2 keyb=5");
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_Header()
+        {
+            // given
+            string bodyAsString = "abc";
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string[]> { { "Content-Type", new[] { "text/plain" } } });
+
+            var response = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer();
+
+            // act
+            var responseMessage = await response.ProvideResponseAsync(request);
+
+            // then
+            Check.That(responseMessage.Body).Equals("test");
+            Check.That(responseMessage.Headers).ContainsKey("x");
+            Check.That(responseMessage.Headers["x"]).ContainsExactly("text/plain");
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_Headers()
+        {
+            // given
+            string bodyAsString = "abc";
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string[]> { { "Content-Type", new[] { "text/plain" } } });
+
+            var response = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}", "{{request.url}}").WithBody("test").WithTransformer();
+
+            // act
+            var responseMessage = await response.ProvideResponseAsync(request);
+
+            // then
+            Check.That(responseMessage.Body).Equals("test");
+            Check.That(responseMessage.Headers).ContainsKey("x");
+            Check.That(responseMessage.Headers["x"]).Contains("text/plain");
+            Check.That(responseMessage.Headers["x"]).Contains("http://localhost/foo");
+        }
+
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_Origin_Port_Protocol_Host()
+        {
+            // given
+            string bodyAsString = "abc";
+            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
+            var request = new RequestMessage(new Uri("http://localhost:1234"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);
+
+            var response = Response.Create()
+                .WithBody("test {{request.origin}} {{request.port}} {{request.protocol}} {{request.host}}")
+                .WithTransformer();
+
+            // act
+            var responseMessage = await response.ProvideResponseAsync(request);
+
+            // then
+            Check.That(responseMessage.Body).Equals("test http://localhost:1234 1234 http localhost");
+        }
+    }
+}
--- a/test/WireMock.Net.Tests/ResponseTests.cs
+++ b/test/WireMock.Net.Tests/ResponseTests.cs
@@ -1,73 +1,15 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using NFluent;
-using Xunit;
 using WireMock.ResponseBuilders;
+using Xunit;

 namespace WireMock.Net.Tests
 {
-    //[TestFixture]
-    public class ResponseTests
+    public partial class ResponseTests
    {
-        private const string clientIP = "::1";
-
-        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_UrlPathVerb()
-        {
-            // given
-            string bodyAsString = "abc";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
-
-            var response = Response.Create()
-                .WithBody("test {{request.url}} {{request.path}} {{request.method}}")
-                .WithTransformer();
-
-            // act
-            var responseMessage = await response.ProvideResponseAsync(request);
-
-            // then
-            Check.That(responseMessage.Body).Equals("test http://localhost/foo /foo post");
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_Query()
-        {
-            // given
-            string bodyAsString = "abc";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo?a=1&a=2&b=5"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
-
-            var response = Response.Create()
-                .WithBody("test keya={{request.query.a}} idx={{request.query.a.[0]}} idx={{request.query.a.[1]}} keyb={{request.query.b}}")
-                .WithTransformer();
-
-            // act
-            var responseMessage = await response.ProvideResponseAsync(request);
-
-            // then
-            Check.That(responseMessage.Body).Equals("test keya=1 idx=1 idx=2 keyb=5");
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_Headers()
-        {
-            // given
-            string bodyAsString = "abc";
-            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8, new Dictionary<string, string> { { "Content-Type", "text/plain" } });
-
-            var response = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer();
-
-            // act
-            var responseMessage = await response.ProvideResponseAsync(request);
-
-            // then
-            Check.That(responseMessage.Body).Equals("test");
-            Check.That(responseMessage.Headers).Contains(new KeyValuePair<string, string>("x", "text/plain"));
-        }
+        private const string ClientIp = "::1";

        [Fact]
        public async Task Response_ProvideResponse_WithBody_Bytes_Encoding_Destination_String()
@@ -75,7 +17,7 @@ namespace WireMock.Net.Tests
            // given
            string bodyAsString = "abc";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            var response = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.String, Encoding.ASCII);

@@ -94,7 +36,7 @@ namespace WireMock.Net.Tests
            // given
            string bodyAsString = "abc";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            var response = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.SameAsSource, Encoding.ASCII);

@@ -113,7 +55,7 @@ namespace WireMock.Net.Tests
            // given
            string bodyAsString = "abc";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            var response = Response.Create().WithBody("test", null, Encoding.ASCII);

@@ -131,7 +73,7 @@ namespace WireMock.Net.Tests
            // given
            string bodyAsString = "abc";
            byte[] body = Encoding.UTF8.GetBytes(bodyAsString);
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", clientIP, body, bodyAsString, Encoding.UTF8);
+            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp, body, bodyAsString, Encoding.UTF8);

            var response = Response.Create().WithBodyAsJson(new { value = "test" }, Encoding.ASCII);

--- a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs
+++ b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs
@@ -7,7 +7,6 @@ using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
 using Xunit;
-using Xunit.Abstractions;

 namespace WireMock.Net.Tests
 {
--- a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj
+++ b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj
@@ -16,12 +16,12 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
    <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="3.1.0" />
-    <PackageReference Include="Moq" Version="4.7.99" />
+    <PackageReference Include="Moq" Version="4.8.1" />
    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
    <PackageReference Include="NFluent" Version="2.0.0" />
    <PackageReference Include="OpenCover" Version="4.6.519" />
    <PackageReference Include="ReportGenerator" Version="2.5.11" />
-    <PackageReference Include="SimMetrics.Net" Version="1.0.3" />
+    <PackageReference Include="SimMetrics.Net" Version="1.0.4" />
    <PackageReference Include="System.Threading" Version="4.3.0" />
 	  <PackageReference Include="xunit" Version="2.3.0-beta1-build3642" /> 
    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta1-build1309" />
Author	SHA1	Message	Date
Stef Heyenrath	e6af765777	1.0.2.12	2018-01-16 20:46:43 +01:00
Stef Heyenrath	97d80ada11	Fixed issue #76 (#77 ) #76	2018-01-16 20:44:59 +01:00
Stef Heyenrath	51bd9ec186	Add WireMock.Net.WebApplication example (#75 )	2018-01-11 19:38:58 +01:00
Stef Heyenrath	da798a59aa	Fix wiki link to `Stubbing & Request Matching`	2018-01-10 16:33:32 +01:00
Stef Heyenrath	71196b51c9	Fixed issue with same Mapping Guid (#73 )	2017-12-20 20:51:51 +01:00
Stef Heyenrath	d0fc889f42	Fix for url encoded path + params (1.0.2.10) - #72 Fix for url encoded path + params (1.0.2.10)	2017-12-12 18:18:04 +01:00
Stef Heyenrath	fd5bc203c3	1.0.2.9	2017-12-07 22:17:35 +01:00
Stef Heyenrath	601af2d6b2	Fixed restricted headers on response (#71 ) * Fixed restricted headers on response * appveyor	2017-12-07 22:16:19 +01:00
Stef Heyenrath	ea16ee866b	1.0.2.8	2017-11-23 20:54:30 +01:00
Stef Heyenrath	ee0cb6e670	Added unit-test for #68 Added unit-test for #68	2017-11-22 21:33:40 +01:00
Alastair Crabtree	798603118c	bug: fix supporting the Patch method and logging the body (#67 ) * bug: fix supporting the Patch method and logging the body - Patch not configured to support Body - Add a unit test * chore: typo fixed * Added / reordered tests for PATCH method	2017-11-20 19:32:36 +01:00
Alastair Crabtree	208303729e	bug: Fix admin api client definition returning the wrong types (#65 ) * bug: Fix admin api client definition returning the wrong types - IFluentMockServerAdmin get, find and get all requests should return a log entry model - Add tests for get and find using the rest ease api client * Fix Build status and rename tests	2017-11-19 20:44:05 +01:00
Stef Heyenrath	d39e9ef7fa	Fixed readme	2017-11-19 11:47:42 +01:00
Stef Heyenrath	431e5656ca	<DebugType>full</DebugType>	2017-11-19 11:37:50 +01:00
Stef Heyenrath	fa919343ac	<DebugType>portable</DebugType>	2017-11-19 11:32:39 +01:00
Stef Heyenrath	d0b48e2967	DebugType, IncludeSource and IncludeSymbols set to 'true'	2017-11-19 10:39:11 +01:00
Stef Heyenrath	018d2a904d	1.0.2.7	2017-11-18 13:49:22 +01:00
Stef Heyenrath	939a5a61ab	1.0.2.7	2017-11-18 13:48:12 +01:00
vladimir-fed	a15e6747b0	Fix issue with concurrent logging (#63 ) * Fix issue with concurrent logging * Fix namespace + code format/cleanup	2017-11-18 12:22:19 +01:00
Alastair Crabtree	6c38400827	Add the Host, Protocol, Port and Origin to the Request message so they can be used in templating (#62 ) * feat: Add the Host, Protocol Port and Origin to the Request message - Add new fields during request message creation, derived from the Uri object - Allow the new fields to be accessed in the templating engine - Add tests for the new fields * source code file reformat * appveyor	2017-11-18 12:03:13 +01:00
Stef Heyenrath	cb1117fdaa	IHeadersAndCookiesRequestBuilder	2017-11-11 10:09:41 +01:00
Stef Heyenrath	e25c873765	Update ProxyAndRecord ProxyAndRecord does not save query-parameters, headers and body (#57)	2017-11-07 21:52:30 +01:00
Stef Heyenrath	d83f308591	1.0.2.6	2017-10-30 08:49:16 +01:00
Oleksandr Liakhevych	c8c9ab99c5	Fix proxy headers handling (#60 ) * Fix proxy headers handling * Small refactor and moved proxy tests to new test-file.	2017-10-28 18:59:34 +02:00
Oleksandr Liakhevych	d134684bcb	Add ability to provide multiple values for headers in response (#59 ) * Add ability to provide multiple values for headers * Updated json model	2017-10-27 21:49:03 +02:00
Stef Heyenrath	a96b7bca1e	WithBodyFromFile (relative)	2017-10-27 12:12:13 +02:00
Stef Heyenrath	cbe6a0a2b4	WithBodyFromFile (#56 )	2017-10-25 21:33:57 +02:00