1.1.10

wip (#435 )
Option to disable JSON deserialization (#434 )
2026-01-11 22:30:41 +01:00 · 2020-03-05 18:23:16 +01:00 · 2020-03-05 18:20:49 +01:00 · 2020-03-05 17:59:24 +01:00 · 2020-03-05 17:56:24 +01:00 · 2020-02-25 22:22:01 +01:00
233 changed files with 7241 additions and 3394 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,34 +1,150 @@
+# 1.1.10.0 (05 March 2020)
+- [#427](https://github.com/WireMock-Net/WireMock.Net/pull/427) - Add UsingOptions, UsingConnect and UsingTrace [feature] contributed by [StefH](https://github.com/StefH)
+- [#434](https://github.com/WireMock-Net/WireMock.Net/pull/434) - Option to disable JSON deserialization [feature] contributed by [sebastianmattar](https://github.com/sebastianmattar)
+- [#435](https://github.com/WireMock-Net/WireMock.Net/pull/435) - Also call HandlebarsRegistrationCallback when using WithCallback(..) [feature] contributed by [StefH](https://github.com/StefH)
+- [#408](https://github.com/WireMock-Net/WireMock.Net/issues/408) - Intermittent threading errors with FindLogEntries [bug]
+- [#433](https://github.com/WireMock-Net/WireMock.Net/issues/433) - HandlebarsRegistrationCallback not fired [feature]
+
+# 1.1.9.0 (25 February 2020)
+- [#431](https://github.com/WireMock-Net/WireMock.Net/pull/431) - Fix LinqMatcher for JSON int64 [bug] contributed by [StefH](https://github.com/StefH)
+- [#425](https://github.com/WireMock-Net/WireMock.Net/issues/425) - Allow 64 bit numbers in JSON [bug]
+
+# 1.1.8.0 (22 February 2020)
+- [#419](https://github.com/WireMock-Net/WireMock.Net/pull/419) - Support multi line wild card matching [bug] contributed by [NoahLerner](https://github.com/NoahLerner)
+- [#421](https://github.com/WireMock-Net/WireMock.Net/pull/421) - Fix: do not return empty matchers array when Func has been used [bug] contributed by [StefH](https://github.com/StefH)
+- [#423](https://github.com/WireMock-Net/WireMock.Net/pull/423) - Fixes for Cookie and Header Reject on Match [bug] contributed by [StefH](https://github.com/StefH)
+- [#424](https://github.com/WireMock-Net/WireMock.Net/pull/424) - Don't return empty dictionary object for response headers in JSON mapping [feature] contributed by [StefH](https://github.com/StefH)
+- [#418](https://github.com/WireMock-Net/WireMock.Net/issues/418) - Body matching fails if body has newline [bug]
+
+# 1.1.7.0 (06 February 2020)
+- [#409](https://github.com/WireMock-Net/WireMock.Net/pull/409) - Admin Delete with mappings in body [feature] contributed by [NoahLerner](https://github.com/NoahLerner)
+- [#411](https://github.com/WireMock-Net/WireMock.Net/pull/411) - Improved relative path checking based on file existence [feature] contributed by [NoahLerner](https://github.com/NoahLerner)
+- [#413](https://github.com/WireMock-Net/WireMock.Net/pull/413) - Fix new Delete with body missing from IWireMockAdminApi interface contributed by [NoahLerner](https://github.com/NoahLerner)
+- [#414](https://github.com/WireMock-Net/WireMock.Net/pull/414) - Fix logger in StandAlone [bug] contributed by [StefH](https://github.com/StefH)
+- [#412](https://github.com/WireMock-Net/WireMock.Net/issues/412) - WireMock Standalone - null reference exception since settings.Logger [bug]
+
+# 1.1.6.0 (27 January 2020)
+- [#407](https://github.com/WireMock-Net/WireMock.Net/pull/407) - AllowAnyHttpStatusCodeInResponse [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.1.5.0 (25 January 2020)
+- [#405](https://github.com/WireMock-Net/WireMock.Net/pull/405) - Fix logging an Exception Message (linux docker on azure) [bug] contributed by [StefH](https://github.com/StefH)
+- [#406](https://github.com/WireMock-Net/WireMock.Net/pull/406) - Fixed StatusCode = null or &lt; 0 [bug] contributed by [StefH](https://github.com/StefH)
+
+# 1.1.3.0 (22 January 2020)
+- [#403](https://github.com/WireMock-Net/WireMock.Net/pull/403) - Fix for invalid cast exception contributed by [kashifsoofi](https://github.com/kashifsoofi)
+- [#402](https://github.com/WireMock-Net/WireMock.Net/issues/402) - Invalid Cast Exception  [bug]
+
+# 1.1.2.0 (09 January 2020)
+- [#399](https://github.com/WireMock-Net/WireMock.Net/pull/399) - ResponseModel.StatusCode is deserialized as either string or long. [bug] contributed by [vitaliydavydiak](https://github.com/vitaliydavydiak)
+- [#400](https://github.com/WireMock-Net/WireMock.Net/issues/400) - StatusCode not built correctly when loaded from mapping file. [bug]
+
+# 1.1.1.0 (09 January 2020)
+- [#398](https://github.com/WireMock-Net/WireMock.Net/pull/398) - Feature/xpath transformer [feature] contributed by [kashifsoofi](https://github.com/kashifsoofi)
+- [#397](https://github.com/WireMock-Net/WireMock.Net/issues/397) - Question/Feature: Add support for selecting XPath in response template [feature]
+
+# 1.1.0.0 (27 December 2019)
+- [#363](https://github.com/WireMock-Net/WireMock.Net/pull/363) - WireMock.Net version 1.1.x contributed by [StefH](https://github.com/StefH)
+
+# 1.0.43.0 (26 December 2019)
+- [#385](https://github.com/WireMock-Net/WireMock.Net/pull/385) - StatusCode as string [feature] contributed by [StefH](https://github.com/StefH)
+- [#380](https://github.com/WireMock-Net/WireMock.Net/issues/380) - StatusCode is defined as integer (string is not possible) [bug]
+- [#382](https://github.com/WireMock-Net/WireMock.Net/issues/382) - Return same request body [feature]
+
+# 1.0.42.0 (15 December 2019)
+- [#391](https://github.com/WireMock-Net/WireMock.Net/pull/391) - Correctly support DateTime pattern as string in ExactMatcher [bug] contributed by [StefH](https://github.com/StefH)
+- [#383](https://github.com/WireMock-Net/WireMock.Net/issues/383) - ExactMatcher does not accept ISO8601 DateTime? [bug]
+
+# 1.0.41.0 (14 December 2019)
+- [#392](https://github.com/WireMock-Net/WireMock.Net/pull/392) - Fix array in JsonMatcher [bug] contributed by [StefH](https://github.com/StefH)
+- [#390](https://github.com/WireMock-Net/WireMock.Net/issues/390) - JsonMatcher does not match a body containing an array of strings [bug]
+
+# 1.0.40.0 (09 December 2019)
+- [#389](https://github.com/WireMock-Net/WireMock.Net/pull/389) - Fix QueryStringParser [bug] contributed by [StefH](https://github.com/StefH)
+- [#387](https://github.com/WireMock-Net/WireMock.Net/issues/387) - Query string parameter value which contains %26 does not work with ExactMatcher [bug]
+
+# 1.0.39.0 (07 December 2019)
+- [#370](https://github.com/WireMock-Net/WireMock.Net/pull/370) - Add WebProxySettings (use when proxying requests) [feature] contributed by [StefH](https://github.com/StefH)
+- [#388](https://github.com/WireMock-Net/WireMock.Net/pull/388) - Transform body as file [bug] contributed by [StefH](https://github.com/StefH)
+- [#369](https://github.com/WireMock-Net/WireMock.Net/issues/369) - Question: Is there a way to provide a corporate proxy configuration? [feature]
+- [#375](https://github.com/WireMock-Net/WireMock.Net/issues/375) - Proxying does not follow redirects : make this configurable [feature]
+- [#386](https://github.com/WireMock-Net/WireMock.Net/issues/386) - Is transforming contents of XML file supported.? [bug]
+
+# 1.0.38.0 (30 November 2019)
+- [#376](https://github.com/WireMock-Net/WireMock.Net/pull/376) - Support int values for states and scenario naming [feature] contributed by [NoahLerner](https://github.com/NoahLerner)
+- [#378](https://github.com/WireMock-Net/WireMock.Net/pull/378) - Set handlebars dependency for .net 4.5.1 to fixed value [bug] contributed by [StefH](https://github.com/StefH)
+- [#381](https://github.com/WireMock-Net/WireMock.Net/pull/381) - Use dotnet default development certificate for .NET Core 2.x [feature] contributed by [StefH](https://github.com/StefH)
+- [#377](https://github.com/WireMock-Net/WireMock.Net/issues/377) - Unable to build against .NET 4.5.1 because of Handlebars [bug]
+
+# 1.0.37.0 (08 November 2019)
+- [#373](https://github.com/WireMock-Net/WireMock.Net/pull/373) - Make Sonar and WhiteSource optional in the Azure pipelines build [feature] contributed by [StefH](https://github.com/StefH)
+- [#374](https://github.com/WireMock-Net/WireMock.Net/pull/374) - WatchStaticMappingsInSubdirectories [feature] contributed by [StefH](https://github.com/StefH)
+- [#372](https://github.com/WireMock-Net/WireMock.Net/issues/372) - Reset in WireMock admin API not working fine. [feature]
+
+# 1.0.36.0 (26 October 2019)
+- [#360](https://github.com/WireMock-Net/WireMock.Net/pull/360) - Add support for Faults [feature] contributed by [StefH](https://github.com/StefH)
+- [#343](https://github.com/WireMock-Net/WireMock.Net/issues/343) - Feature: Please provide support for Bad responses. [feature]
+
+# 1.0.35.0 (25 October 2019)
+- [#367](https://github.com/WireMock-Net/WireMock.Net/pull/367) - No symbol NuGets [feature] contributed by [StefH](https://github.com/StefH)
+- [#368](https://github.com/WireMock-Net/WireMock.Net/pull/368) - Remove Obsolete annotations [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.0.34.0 (22 October 2019)
+- [#354](https://github.com/WireMock-Net/WireMock.Net/pull/354) - AllowBodyForAllHttpMethods [bug, feature] contributed by [StefH](https://github.com/StefH)
+- [#365](https://github.com/WireMock-Net/WireMock.Net/pull/365) - Bump Microsoft.AspNetCore.All from 2.0.8 to 2.0.9 in /examples/WireMock.Net.WebApplication [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#366](https://github.com/WireMock-Net/WireMock.Net/pull/366) - Update ObsoleteAnnotations [feature] contributed by [StefH](https://github.com/StefH)
+- [#352](https://github.com/WireMock-Net/WireMock.Net/issues/352) - DELETE request drops the body [feature]
+
+# 1.0.33.0 (12 October 2019)
+- [#311](https://github.com/WireMock-Net/WireMock.Net/pull/311) - fix jsonpath matcher [bug] contributed by [StefH](https://github.com/StefH)
+- [#324](https://github.com/WireMock-Net/WireMock.Net/pull/324) - Add CSharpCodeMatcher [feature] contributed by [StefH](https://github.com/StefH)
+- [#353](https://github.com/WireMock-Net/WireMock.Net/pull/353) - Fixed failing admin requests when content type includes a charset (based on idea from Paul Roub) [bug] contributed by [StefH](https://github.com/StefH)
+- [#355](https://github.com/WireMock-Net/WireMock.Net/pull/355) - Add Try-Catch to the event LogEntriesChanged [feature] contributed by [StefH](https://github.com/StefH)
+- [#357](https://github.com/WireMock-Net/WireMock.Net/pull/357) - Add Proxy Setting for: SaveMappingForStatusCodePattern to only save the mapping when the status code matches the pattern [feature] contributed by [StefH](https://github.com/StefH)
+- [#358](https://github.com/WireMock-Net/WireMock.Net/pull/358) - Fix JsonMatcher (parsing DateTimeOffset) contributed by [StefH](https://github.com/StefH)
+- [#306](https://github.com/WireMock-Net/WireMock.Net/issues/306) - Writing to the response body is invalid for responses with status code 204 [bug]
+- [#307](https://github.com/WireMock-Net/WireMock.Net/issues/307) - JsonPathMatcher always convert to JArray before matching [bug]
+- [#329](https://github.com/WireMock-Net/WireMock.Net/issues/329) - Feature: Add support for CSharpCodeMatcher [feature]
+- [#350](https://github.com/WireMock-Net/WireMock.Net/issues/350) - Admin requests fail when content type includes a charset [bug]
+- [#356](https://github.com/WireMock-Net/WireMock.Net/issues/356) - JsonMatcher not working when JSON contains a DateTimeOffset [bug]
+
+# 1.0.32.0 (20 September 2019)
+- [#348](https://github.com/WireMock-Net/WireMock.Net/pull/348) - When posting new mapping, use DateParseHandling.None [bug] contributed by [StefH](https://github.com/StefH)
+- [#347](https://github.com/WireMock-Net/WireMock.Net/issues/347) - Query string match on DateTimeOffset is not working [bug]
+
+# 1.0.31.0 (19 September 2019)
+- [#334](https://github.com/WireMock-Net/WireMock.Net/pull/334) - Fix issues with Proxy mode and Binary Request Bodies [bug] contributed by [andi0b](https://github.com/andi0b)
+- [#338](https://github.com/WireMock-Net/WireMock.Net/pull/338) - Fix ContentType with parameters in Proxy Mode [bug] contributed by [StefH](https://github.com/StefH)
+- [#339](https://github.com/WireMock-Net/WireMock.Net/pull/339) - Fix ConcurrentObservableCollection [bug] contributed by [StefH](https://github.com/StefH)
+- [#345](https://github.com/WireMock-Net/WireMock.Net/pull/345) - Fix CompareTo in RequestMatchResult [bug] contributed by [StefH](https://github.com/StefH)
+- [#346](https://github.com/WireMock-Net/WireMock.Net/pull/346) - Fix recorded requests skipped by request logger contributed by [vitaliydavydiak](https://github.com/vitaliydavydiak)
+- [#337](https://github.com/WireMock-Net/WireMock.Net/issues/337) - Proxy Missing header Content-Type - tried with Recording [bug]
+- [#344](https://github.com/WireMock-Net/WireMock.Net/issues/344) - Mapping adding order matters for multiple mappings? [bug]
+
+# 1.0.29.0 (29 August 2019)
+- [#328](https://github.com/WireMock-Net/WireMock.Net/pull/328) - Fix LogRequest : Index Out Of Bounds [bug] contributed by [StefH](https://github.com/StefH)
+- [#331](https://github.com/WireMock-Net/WireMock.Net/pull/331) - Fix: Collection was modified exception [bug] contributed by [theramis](https://github.com/theramis)
+- [#333](https://github.com/WireMock-Net/WireMock.Net/pull/333) - JsonMatcher support IgnoreCase [feature] contributed by [StefH](https://github.com/StefH)
+- [#332](https://github.com/WireMock-Net/WireMock.Net/issues/332) - Case sensitive true is ignored for JsonMatcher [feature]
+
 # 1.0.28.0 (20 August 2019)
+- [#309](https://github.com/WireMock-Net/WireMock.Net/pull/309) - Fix LogEntries: collection was modified exception [bug] contributed by [StefH](https://github.com/StefH)
+- [#314](https://github.com/WireMock-Net/WireMock.Net/pull/314) - RequestLogExpirationDuration : use DateTime.UtcNow [bug] contributed by [StefH](https://github.com/StefH)
+- [#316](https://github.com/WireMock-Net/WireMock.Net/pull/316) - Handles case where parameter value contains == [feature] contributed by [lobsteropteryx](https://github.com/lobsteropteryx)
 - [#317](https://github.com/WireMock-Net/WireMock.Net/pull/317) - Make SaveMapping and SaveMappingToFile settings independent. [feature] contributed by [vitaliydavydiak](https://github.com/vitaliydavydiak)
 - [#319](https://github.com/WireMock-Net/WireMock.Net/pull/319) - Add blacklist for Request Cookies. contributed by [vitaliydavydiak](https://github.com/vitaliydavydiak)
- [#320](https://github.com/WireMock-Net/WireMock.Net/pull/320) - Remove coverlet folder from source control [doc] contributed by [StefH](https://github.com/StefH)
 - [#322](https://github.com/WireMock-Net/WireMock.Net/pull/322) - Fix MappingMatcher in case of an exception in LinqMatcher. [bug] contributed by [StefH](https://github.com/StefH)
 - [#323](https://github.com/WireMock-Net/WireMock.Net/pull/323) - Refactor MappingConverter &amp; MatcherMapper [refactor] contributed by [StefH](https://github.com/StefH)
 - [#326](https://github.com/WireMock-Net/WireMock.Net/pull/326) - Fix Parsing Guid in PUT Mapping [bug] contributed by [StefH](https://github.com/StefH)
- [#318](https://github.com/WireMock-Net/WireMock.Net/issues/318) - Documentation: Add valid CLI parameters [doc, question]
- [#325](https://github.com/WireMock-Net/WireMock.Net/issues/325) - Admin API: PUT Mapping, FormatException because of wrong parsing of the Query  [bug]
-
-# 1.0.27.0 (14 August 2019)
- [#316](https://github.com/WireMock-Net/WireMock.Net/pull/316) - Handles case where parameter value contains == [feature] contributed by [lobsteropteryx](https://github.com/lobsteropteryx)
- [#287](https://github.com/WireMock-Net/WireMock.Net/issues/287) - Error with parameter that contains a &quot;=&quot; character [bug, question]
- [#315](https://github.com/WireMock-Net/WireMock.Net/issues/315) - Wiki - Proxying: AtPriority() example not set on right object [doc]
-
-# 1.0.26.0 (11 August 2019)
- [#309](https://github.com/WireMock-Net/WireMock.Net/pull/309) - Fix LogEntries: collection was modified exception [bug] contributed by [StefH](https://github.com/StefH)
- [#314](https://github.com/WireMock-Net/WireMock.Net/pull/314) - RequestLogExpirationDuration : use DateTime.UtcNow [bug] contributed by [StefH](https://github.com/StefH)
- [#252](https://github.com/WireMock-Net/WireMock.Net/issues/252) - Proxy with Transform [help wanted]
- [#305](https://github.com/WireMock-Net/WireMock.Net/issues/305) - Allow Custom SSL Certification? [question]
+- [#252](https://github.com/WireMock-Net/WireMock.Net/issues/252) - Proxy with Transform
 - [#308](https://github.com/WireMock-Net/WireMock.Net/issues/308) - __admin/requests - &quot;Collection was modified&quot; exception [bug]
 - [#313](https://github.com/WireMock-Net/WireMock.Net/issues/313) - RequestLogExpirationDuration - bug [bug]
+- [#325](https://github.com/WireMock-Net/WireMock.Net/issues/325) - Admin API: PUT Mapping, FormatException because of wrong parsing of the Query  [bug]

 # 1.0.25.0 (23 July 2019)
 - [#304](https://github.com/WireMock-Net/WireMock.Net/pull/304) - Support WithBody with multiple matchers [feature] contributed by [StefH](https://github.com/StefH)
- [#303](https://github.com/WireMock-Net/WireMock.Net/issues/303) - Question: WithBody can't be used with multiple matching rules? [question]

 # 1.0.24.0 (22 July 2019)
 - [#302](https://github.com/WireMock-Net/WireMock.Net/pull/302) - Fixed bug 301 by not setting BodyAsFile to null after first use [bug] contributed by [rwwilden](https://github.com/rwwilden)
- [#299](https://github.com/WireMock-Net/WireMock.Net/issues/299) - Get Mappings models instead of just IMapping interface [feature, question]
- [#300](https://github.com/WireMock-Net/WireMock.Net/issues/300) - Integration with Azure Function [question]
 - [#301](https://github.com/WireMock-Net/WireMock.Net/issues/301) - Error thrown when calling mocked endpoint second time when using file-based response body [bug]

 # 1.0.23.0 (16 July 2019)
@@ -36,28 +152,20 @@

 # 1.0.22.0 (15 July 2019)
 - [#297](https://github.com/WireMock-Net/WireMock.Net/pull/297) - FixNullRef (#295) contributed by [StefH](https://github.com/StefH)
- [#178](https://github.com/WireMock-Net/WireMock.Net/issues/178) - Bug: Path matching fails when the URL contains encoded parts [bug, question]
 - [#295](https://github.com/WireMock-Net/WireMock.Net/issues/295) - NullRef in 1.0.21 [bug]
- [#296](https://github.com/WireMock-Net/WireMock.Net/issues/296) - url param - how to accept either of multiple values [question]

 # 1.0.21.0 (03 July 2019)
 - [#286](https://github.com/WireMock-Net/WireMock.Net/pull/286) - Handlebars Extension [feature] contributed by [StefH](https://github.com/StefH)
 - [#293](https://github.com/WireMock-Net/WireMock.Net/pull/293) - workaround for AppContext.BaseDirectory being null on some platforms contributed by [eli-darkly](https://github.com/eli-darkly)
 - [#294](https://github.com/WireMock-Net/WireMock.Net/pull/294) - don't strip request body if we don't recognize the request method contributed by [eli-darkly](https://github.com/eli-darkly)
- [#275](https://github.com/WireMock-Net/WireMock.Net/issues/275) - Server not starting up with 1.0.15 code [invalid, question]
- [#280](https://github.com/WireMock-Net/WireMock.Net/issues/280) - Static Mapping Not work [question]
- [#285](https://github.com/WireMock-Net/WireMock.Net/issues/285) - Need ability to add custom ResponseMessageTransformers [feature, question]
- [#288](https://github.com/WireMock-Net/WireMock.Net/issues/288) - Allow setting root folder in LocalFileSystemHandler [feature, question]
 - [#289](https://github.com/WireMock-Net/WireMock.Net/issues/289) - Bug:  When WatchStaticMappings=true throws exceptions on updating the mapping files [bug]
 - [#290](https://github.com/WireMock-Net/WireMock.Net/issues/290) - Request body is dropped if verb is REPORT [bug]
- [#291](https://github.com/WireMock-Net/WireMock.Net/issues/291) - Define multiple scenarios for the same url path and switch to it at run-time? [question]
 - [#292](https://github.com/WireMock-Net/WireMock.Net/issues/292) - Can't start server in Xamarin Android [bug]

 # 1.0.20.0 (17 June 2019)
 - [#284](https://github.com/WireMock-Net/WireMock.Net/pull/284) - Add SaveToFile in the mapping [feature] contributed by [StefH](https://github.com/StefH)

 # 1.0.19.0 (15 June 2019)
- [#279](https://github.com/WireMock-Net/WireMock.Net/issues/279) - How to simulate disconnect? [question]
 - [#283](https://github.com/WireMock-Net/WireMock.Net/issues/283) - Support equal-sign in query [bug]

 # 1.0.18.0 (10 June 2019)
@@ -65,7 +173,6 @@

 # 1.0.17.0 (05 June 2019)
 - [#278](https://github.com/WireMock-Net/WireMock.Net/pull/278) - Add support for HandleBars File (to read a file) [feature] contributed by [StefH](https://github.com/StefH)
- [#276](https://github.com/WireMock-Net/WireMock.Net/issues/276) - No server response in Postman and Receive Failure in Fiddler [invalid]

 # 1.0.16.0 (16 May 2019)
 - [#274](https://github.com/WireMock-Net/WireMock.Net/pull/274) - Sign Assembly [feature] contributed by [StefH](https://github.com/StefH)
@@ -76,11 +183,9 @@
 - [#271](https://github.com/WireMock-Net/WireMock.Net/pull/271) - Support Dynamic response files using Handlebars templating [bug, feature] contributed by [StefH](https://github.com/StefH)
 - [#272](https://github.com/WireMock-Net/WireMock.Net/pull/272) - Add unit test for JsonPath and BodyAsFile mapping contributed by [denstorti](https://github.com/denstorti)
 - [#273](https://github.com/WireMock-Net/WireMock.Net/pull/273) - Dynamic response handlebars templating (2) [bug, feature] contributed by [StefH](https://github.com/StefH)
- [#270](https://github.com/WireMock-Net/WireMock.Net/issues/270) - Dynamic response files using Handlebars templating [bug, question]

 # 1.0.14.0 (20 April 2019)
 - [#269](https://github.com/WireMock-Net/WireMock.Net/pull/269) - Add JmesPath matcher [feature] contributed by [StefH](https://github.com/StefH)
- [#268](https://github.com/WireMock-Net/WireMock.Net/issues/268) - Swagger UI for admin api [question]

 # 1.0.13.0 (11 April 2019)
 - [#266](https://github.com/WireMock-Net/WireMock.Net/pull/266) - [265] Add file upload to allow mocking of file operations contributed by [JackCreativeCrew](https://github.com/JackCreativeCrew)
@@ -96,8 +201,6 @@

 # 1.0.10.0 (27 March 2019)
 - [#260](https://github.com/WireMock-Net/WireMock.Net/pull/260) - Fix Response.Delay property serialization [bug] contributed by [StefH](https://github.com/StefH)
- [#257](https://github.com/WireMock-Net/WireMock.Net/issues/257) - Doc: Update outdated  [question]
- [#258](https://github.com/WireMock-Net/WireMock.Net/issues/258) - InvalidProgramException when following running as standalone process example with dotnetcore  [invalid]

 # 1.0.9.0 (25 March 2019)
 - [#256](https://github.com/WireMock-Net/WireMock.Net/pull/256) - Fixed Multi Param Match logic contributed by [StefH](https://github.com/StefH)
@@ -105,26 +208,21 @@

 # 1.0.8.0 (12 March 2019)
 - [#254](https://github.com/WireMock-Net/WireMock.Net/pull/254) - RequestMessageParamMatcher supports Ignore Case for the key [feature] contributed by [StefH](https://github.com/StefH)
- [#251](https://github.com/WireMock-Net/WireMock.Net/issues/251) - Problem with Request Match WithBody [question]
 - [#253](https://github.com/WireMock-Net/WireMock.Net/issues/253) - Request Path and query parameter keys are case-sensitive

 # 1.0.7.0 (19 January 2019)
 - [#244](https://github.com/WireMock-Net/WireMock.Net/pull/244) - Fix BodyAsFile to also allow relative paths [feature] contributed by [StefH](https://github.com/StefH)
 - [#240](https://github.com/WireMock-Net/WireMock.Net/issues/240) - How to submit mappings for multiple request, responses [feature]
- [#243](https://github.com/WireMock-Net/WireMock.Net/issues/243) - Not able to read response from file [question]
+- [#243](https://github.com/WireMock-Net/WireMock.Net/issues/243) - Not able to read response from file [bug]

 # 1.0.6.1 (10 January 2019)
 - [#247](https://github.com/WireMock-Net/WireMock.Net/pull/247) - Issue 225 improve logging in example for wire mock as windows service contributed by [paulssn](https://github.com/paulssn)
 - [#249](https://github.com/WireMock-Net/WireMock.Net/pull/249) - Fixed &quot;Content-Type multipart/form-data&quot; [bug] contributed by [StefH](https://github.com/StefH)
 - [#225](https://github.com/WireMock-Net/WireMock.Net/issues/225) - Feature: Improve logging in example for WireMock as Windows Service [feature]
- [#238](https://github.com/WireMock-Net/WireMock.Net/issues/238) - Localhost and free port problem [question]
- [#245](https://github.com/WireMock-Net/WireMock.Net/issues/245) - Not able to match XML request body using XPathMatcher pattern [question]
 - [#248](https://github.com/WireMock-Net/WireMock.Net/issues/248) - Content-Type multipart/form-data is not seen as byte[] anymore

 # 1.0.6 (15 December 2018)
 - [#242](https://github.com/WireMock-Net/WireMock.Net/pull/242) - Post multiple Mappings [feature] contributed by [StefH](https://github.com/StefH)
- [#237](https://github.com/WireMock-Net/WireMock.Net/issues/237) - Port not released [question]
- [#239](https://github.com/WireMock-Net/WireMock.Net/issues/239) - Not able to hit the mock server if AllowPartialMapping is not set to true [question]

 # 1.0.5 (07 December 2018)
 - [#236](https://github.com/WireMock-Net/WireMock.Net/pull/236) - Add Random Regex (using Fare) [feature] contributed by [StefH](https://github.com/StefH)
@@ -145,7 +243,6 @@
 - [#224](https://github.com/WireMock-Net/WireMock.Net/pull/224) - Fixed issue 223: Example for WireMock as Windows Service throws Exception because of WireMockConsoleLogger contributed by [paulssn](https://github.com/paulssn)
 - [#228](https://github.com/WireMock-Net/WireMock.Net/pull/228) - Fixed logic for IsRestrictedResponseHeader [bug] contributed by [StefH](https://github.com/StefH)
 - [#223](https://github.com/WireMock-Net/WireMock.Net/issues/223) - Bug: Example for WireMock as Windows Service throws Exception because of WireMockConsoleLogger [bug]
- [#227](https://github.com/WireMock-Net/WireMock.Net/issues/227) - Question: proxy passthrough when no match? [question]

 # 1.0.4.19 (31 October 2018)
 - [#220](https://github.com/WireMock-Net/WireMock.Net/pull/220) - Update SimpleCommandLineParser to handle arguments with key and value contributed by [StefH](https://github.com/StefH)
@@ -171,7 +268,6 @@
 # 1.0.4.17 (22 September 2018)
 - [#203](https://github.com/WireMock-Net/WireMock.Net/pull/203) - Set up CI with Azure Pipelines contributed by [azure-pipelines[bot]](https://github.com/apps/azure-pipelines)
 - [#204](https://github.com/WireMock-Net/WireMock.Net/pull/204) - Lower priority from Proxy mappings in favor of Admin Mappings [feature] contributed by [StefH](https://github.com/StefH)
- [#115](https://github.com/WireMock-Net/WireMock.Net/issues/115) - Question : Do we have provision to read the Response data from a file? [question]
 - [#200](https://github.com/WireMock-Net/WireMock.Net/issues/200) - Issue: Incorrect port matching
 - [#205](https://github.com/WireMock-Net/WireMock.Net/issues/205) - Issue: DELETE method is proxied as lowercase [bug]

@@ -190,7 +286,6 @@
 # 1.0.4.13 (31 August 2018)
 - [#195](https://github.com/WireMock-Net/WireMock.Net/pull/195) - Add LinqMatcher contributed by [StefH](https://github.com/StefH)
 - [#192](https://github.com/WireMock-Net/WireMock.Net/issues/192) - Cannot upgrade from 1.0.4.10 to 1.0.4.12 without upgrading to .net core 2.1 [bug]
- [#193](https://github.com/WireMock-Net/WireMock.Net/issues/193) - Question: WireMock in Azure [question]

 # 1.0.4.12 (23 August 2018)
 - [#190](https://github.com/WireMock-Net/WireMock.Net/pull/190) - Fix ResponseMessageTransformer (#188) contributed by [StefH](https://github.com/StefH)
@@ -233,10 +328,8 @@
 - [#164](https://github.com/WireMock-Net/WireMock.Net/pull/164) - Support running WireMock.Net as a sub-app in IIS [feature] contributed by [StefH](https://github.com/StefH)
 - [#165](https://github.com/WireMock-Net/WireMock.Net/pull/165) - Add SonarCloud contributed by [StefH](https://github.com/StefH)
 - [#166](https://github.com/WireMock-Net/WireMock.Net/pull/166) - Fix Sonar issues contributed by [StefH](https://github.com/StefH)
- [#105](https://github.com/WireMock-Net/WireMock.Net/issues/105) - Question: URL binding issues [question]
 - [#120](https://github.com/WireMock-Net/WireMock.Net/issues/120) - Question: JsonPathMatcher - not matching? Correct syntax?
 - [#123](https://github.com/WireMock-Net/WireMock.Net/issues/123) - Fix for DateTime Header causing null value in ResponseBuilder
- [#158](https://github.com/WireMock-Net/WireMock.Net/issues/158) - Feature: Support running WireMock.Net as a sub-app in IIS [question]

 # 1.0.4.4 (01 July 2018)
 - [#156](https://github.com/WireMock-Net/WireMock.Net/issues/156) - Feature: when adding / updating a mapping : return more details
@@ -268,24 +361,18 @@

 # 1.0.3.18 (25 May 2018)
 - [#142](https://github.com/WireMock-Net/WireMock.Net/pull/142) - Allow all headers to be set as Response headers contributed by [StefH](https://github.com/StefH)
- [#97](https://github.com/WireMock-Net/WireMock.Net/issues/97) - Request matching logic is not practical [question]
 - [#122](https://github.com/WireMock-Net/WireMock.Net/issues/122) - WireMock.Net not responding in unit tests - same works in console application
 - [#126](https://github.com/WireMock-Net/WireMock.Net/issues/126) - Question: UsingHead always returns 0 for Content-Length header even when explicitly specified
- [#127](https://github.com/WireMock-Net/WireMock.Net/issues/127) - Question: Stub priority - Most recent stub is not always used [question]
 - [#132](https://github.com/WireMock-Net/WireMock.Net/issues/132) - LogEntries not being recorded on subsequent tests
 - [#136](https://github.com/WireMock-Net/WireMock.Net/issues/136) - Question: Does the WireMock send Content-Length response header
 - [#137](https://github.com/WireMock-Net/WireMock.Net/issues/137) - Question: How to specify Transfer-Encoding response header?
 - [#139](https://github.com/WireMock-Net/WireMock.Net/issues/139) - Wiki link https://github.com/StefH/WireMock.Net/wiki/Record-(via-proxy)-and-Save is dead
- [#140](https://github.com/WireMock-Net/WireMock.Net/issues/140) - Question: Why the Microsoft.Owin.Host.HttpListener is not referenced in the dll, which uses WireMock? [question]

 # 1.0.3.17 (16 May 2018)
 - [#134](https://github.com/WireMock-Net/WireMock.Net/pull/134) - Stef negate matcher contributed by [alastairtree](https://github.com/alastairtree)
 - [#135](https://github.com/WireMock-Net/WireMock.Net/pull/135) - Merge into the stef_negate_matcher branch (solves issue #133) contributed by [StefH](https://github.com/StefH)
 - [#138](https://github.com/WireMock-Net/WireMock.Net/pull/138) - Added Negate matcher logic contributed by [StefH](https://github.com/StefH)
- [#103](https://github.com/WireMock-Net/WireMock.Net/issues/103) - Support for Faults [question]
- [#128](https://github.com/WireMock-Net/WireMock.Net/issues/128) - Feature: Negate a matcher [feature, question]
 - [#130](https://github.com/WireMock-Net/WireMock.Net/issues/130) - ...
- [#133](https://github.com/WireMock-Net/WireMock.Net/issues/133) - Issue: Wildcard matching a json body does not work? [bug, question]

 # 1.0.3.16 (17 April 2018)
 - [#121](https://github.com/WireMock-Net/WireMock.Net/pull/121) - Fix for issue #118 [bug] contributed by [raghavendrabankapur](https://github.com/raghavendrabankapur)
@@ -302,9 +389,6 @@
 - [#113](https://github.com/WireMock-Net/WireMock.Net/issues/113) - Feature: Add BodyAsJsonIndented for response message [feature]
 - [#114](https://github.com/WireMock-Net/WireMock.Net/issues/114) - Feature: Add PathSegments in Transform [feature]

-# 1.0.3.12 (24 March 2018)
- [#100](https://github.com/WireMock-Net/WireMock.Net/issues/100) - Issue: JsonPathMatcher - not working for rootless jsons? [question]
-
 # 1.0.3.11 (20 March 2018)
 - [#110](https://github.com/WireMock-Net/WireMock.Net/issues/110) - Fix: remove `Func[]` from MappingModel

@@ -317,9 +401,6 @@
 # 1.0.3.8 (10 March 2018)
 - [#106](https://github.com/WireMock-Net/WireMock.Net/issues/106) - Issue: Params does not work, when there are multiple values for a key

-# 1.0.3.7 (09 March 2018)
- [#104](https://github.com/WireMock-Net/WireMock.Net/issues/104) - Issue: PlatformNotSupportedException [question]
-
 # 1.0.3.4 (04 March 2018)
 - [#95](https://github.com/WireMock-Net/WireMock.Net/pull/95) - Unittest fix contributed by [StefH](https://github.com/StefH)
 - [#96](https://github.com/WireMock-Net/WireMock.Net/pull/96) - Replace log4net by custom logger (#94) contributed by [StefH](https://github.com/StefH)
@@ -375,7 +456,6 @@
 - [#65](https://github.com/WireMock-Net/WireMock.Net/pull/65) - bug: Fix admin api client definition returning the wrong types contributed by [alastairtree](https://github.com/alastairtree)
 - [#67](https://github.com/WireMock-Net/WireMock.Net/pull/67) - bug: fix supporting the Patch method and logging the body contributed by [alastairtree](https://github.com/alastairtree)
 - [#64](https://github.com/WireMock-Net/WireMock.Net/issues/64) - Pull Requests do not trigger test + codecoverage ?
- [#68](https://github.com/WireMock-Net/WireMock.Net/issues/68) - Full path required in Stub [question]

 # 1.0.2.7 (18 November 2017)
 - [#62](https://github.com/WireMock-Net/WireMock.Net/pull/62) - Add the Host, Protocol, Port and Origin to the Request message so they can be used in templating contributed by [alastairtree](https://github.com/alastairtree)
@@ -383,7 +463,6 @@
 - [#27](https://github.com/WireMock-Net/WireMock.Net/issues/27) - New feature: Record and Save
 - [#42](https://github.com/WireMock-Net/WireMock.Net/issues/42) - Enhancement - Save/load request logs to/from disk [feature]
 - [#53](https://github.com/WireMock-Net/WireMock.Net/issues/53) - New feature request: Access to Owin pipeline
- [#61](https://github.com/WireMock-Net/WireMock.Net/issues/61) - Partial mapping [question]

 # 1.0.2.6 (30 October 2017)
 - [#59](https://github.com/WireMock-Net/WireMock.Net/pull/59) - Add ability to provide multiple values for headers in response contributed by [Dreamescaper](https://github.com/Dreamescaper)
@@ -407,13 +486,8 @@
 - [#45](https://github.com/WireMock-Net/WireMock.Net/pull/45) - Add RequestLogExpirationDuration and MaxRequestLogCount (#43) contributed by [StefH](https://github.com/StefH)
 - [#51](https://github.com/WireMock-Net/WireMock.Net/pull/51) - Observable logs contributed by [deeptowncitizen](https://github.com/deeptowncitizen)
 - [#15](https://github.com/WireMock-Net/WireMock.Net/issues/15) - New feature: Proxying [feature]
- [#19](https://github.com/WireMock-Net/WireMock.Net/issues/19) - Is this the same as Mock4Net? [question]
- [#20](https://github.com/WireMock-Net/WireMock.Net/issues/20) - Add client certificate authentication [question]
 - [#31](https://github.com/WireMock-Net/WireMock.Net/issues/31) - Feature request: Nuget package for standalone version [feature]
 - [#33](https://github.com/WireMock-Net/WireMock.Net/issues/33) - Issue with launching sample code (StandAlone server) [bug]
- [#34](https://github.com/WireMock-Net/WireMock.Net/issues/34) - Where is SearchLogsFor method? [question]
- [#36](https://github.com/WireMock-Net/WireMock.Net/issues/36) - How to implement a request body-dependent response? [question]
- [#37](https://github.com/WireMock-Net/WireMock.Net/issues/37) - Wrong Request Match result is returning [question]
 - [#38](https://github.com/WireMock-Net/WireMock.Net/issues/38) - Bug: support also listening on *:{port}
 - [#43](https://github.com/WireMock-Net/WireMock.Net/issues/43) - Feature: Add RequestLogExpirationDuration and MaxRequestLogCount
 - [#46](https://github.com/WireMock-Net/WireMock.Net/issues/46) - Log the ip-address from the client/caller also in the RequestLog [feature]
@@ -421,8 +495,6 @@
 - [#50](https://github.com/WireMock-Net/WireMock.Net/issues/50) - New Feature: Callbacks

 # 1.0.2.1 (14 June 2017)
- [#28](https://github.com/WireMock-Net/WireMock.Net/issues/28) - Facing issue with WildcardMatcher and '?' [question]
- [#29](https://github.com/WireMock-Net/WireMock.Net/issues/29) - Support of .Net 4.0 [question]
 - [#30](https://github.com/WireMock-Net/WireMock.Net/issues/30) - [Feature] Disable partial mappings by default in standalone version [bug, feature]

 # 1.0.2.0 (05 May 2017)
@@ -443,7 +515,6 @@
 - [#4](https://github.com/WireMock-Net/WireMock.Net/issues/4) - Handlebar support
 - [#5](https://github.com/WireMock-Net/WireMock.Net/issues/5) - Xml(2)Path matching
 - [#6](https://github.com/WireMock-Net/WireMock.Net/issues/6) - JsonPath support matching
- [#7](https://github.com/WireMock-Net/WireMock.Net/issues/7) - Add WithStatusCodeRange matching [invalid]
 - [#9](https://github.com/WireMock-Net/WireMock.Net/issues/9) - Cookie matching
 - [#10](https://github.com/WireMock-Net/WireMock.Net/issues/10) - Add usingDelete [feature]
 - [#11](https://github.com/WireMock-Net/WireMock.Net/issues/11) - Add response body in binary format  [feature]
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
  </PropertyGroup>

  <PropertyGroup>
-    <VersionPrefix>1.0.28</VersionPrefix>
+    <VersionPrefix>1.1.10</VersionPrefix>
  </PropertyGroup>

  <Choose>
--- a/GitHubReleaseNotes.txt
+++ b/GitHubReleaseNotes.txt
@@ -1,3 +1,3 @@
 https://github.com/StefH/GitHubReleaseNotes

-GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.28.0
+GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc --version 1.1.10.0
--- a/README.md
+++ b/README.md
@@ -28,13 +28,14 @@ A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) w
 | &nbsp;&nbsp;**Sonar Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=coverage)](https://sonarcloud.io/component_measures?id=wiremock&metric=coverage) |
 | &nbsp;&nbsp;**Codecov** | [![codecov](https://codecov.io/gh/WireMock-Net/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/WireMock-Net/WireMock.Net) |
 | &nbsp;&nbsp;**Coveralls** | [![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) |
-| |
-| ***NuGet*** | &nbsp; |
-| &nbsp;&nbsp;**WireMock.Net** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |
-| &nbsp;&nbsp;**WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net.StandAlone](https://buildstats.info/nuget/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |
-| ***MyGet (previews)*** | &nbsp; |
-| &nbsp;&nbsp;**WireMock.Net** | [![MyGet Badge WireMock.Net](https://buildstats.info/myget/wiremock-net/WireMock.Net)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net) |
-| &nbsp;&nbsp;**WireMock.Net.StandAlone** | [![MyGet Badge WireMock.Net.StandAlone](https://buildstats.info/myget/wiremock-net/WireMock.Net.StandAlone)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.StandAlone) |
+
+### NuGet packages
+
+| | Official | Preview |
+| - | - | - |
+| &nbsp;&nbsp;**WireMock.Net** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |  [![MyGet Badge WireMock.Net](https://buildstats.info/myget/wiremock-net/WireMock.Net)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net)
+| &nbsp;&nbsp;**WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |  [![MyGet Badge WireMock.Net.StandAlone](https://buildstats.info/myget/wiremock-net/WireMock.Net.StandAlone)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.StandAlone)
+| &nbsp;&nbsp;**WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://buildstats.info/nuget/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Net.RestClient)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)

 ## Development
 For the supported frameworks and build information, see [this](https://github.com/WireMock-Net/WireMock.Net/wiki/Development-Information) page.
--- a/Solution.sln
+++ b/Solution.sln
@@ -1,15 +1,17 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2036
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EF242EDF-7133-4277-9A0C-18744DE08707}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{197A0EE3-94E5-4807-BBCF-2F1BCA28A6AE}"
 	ProjectSection(SolutionItems) = preProject
 		.runsettings = .runsettings
+		azure-pipelines-ci-linux.yml = azure-pipelines-ci-linux.yml
+		azure-pipelines-ci.yml = azure-pipelines-ci.yml
 		azure-pipelines-linux.yml = azure-pipelines-linux.yml
-		azure-pipelines.yml = azure-pipelines.yml
+		azure-pipelines-nuget.yml = azure-pipelines-nuget.yml
 		build-info.md = build-info.md
 		CHANGELOG.md = CHANGELOG.md
 		Directory.Build.props = Directory.Build.props
@@ -35,14 +37,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.Proxy.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Client", "examples\WireMock.Net.Client\WireMock.Net.Client.csproj", "{058D4B6C-C03E-49D0-91DB-A535B058FA0D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.StandAlone", "src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj", "{B6269AAC-170A-43D5-8B9A-579DED3D9A95}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.StandAlone.NETCoreApp", "examples\WireMock.Net.StandAlone.NETCoreApp\WireMock.Net.StandAlone.NETCoreApp.csproj", "{10E16614-61CA-48D8-8BDD-664C13913DED}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net452", "examples\WireMock.Net.StandAlone.Net452\WireMock.Net.StandAlone.Net452.csproj", "{668F689E-57B4-422E-8846-C0FF643CA999}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {B6269AAC-170A-43D5-8B9A-579DED3D9A95}
-	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.WebApplication.NETCore2", "examples\WireMock.Net.WebApplication\WireMock.Net.WebApplication.NETCore2.csproj", "{049539C1-7A66-4559-AD7A-B1C73B97CBB0}"
 EndProject
@@ -54,88 +51,258 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Service", "examples\Wiremock.Net.Service\WireMock.Net.Service.csproj", "{7F0B2446-0363-4720-AF46-F47F83B557DC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.HeadersTest", "examples\WireMock.Net.Console.HeadersTest\WireMock.Net.Console.HeadersTest.csproj", "{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net461.Classic", "examples\WireMock.Net.Console.Net461.Classic\WireMock.Net.Console.Net461.Classic.csproj", "{1261BB9B-A7D4-456C-8985-3CE560361B8E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net452.Classic", "examples\WireMock.Net.Console.Net452.Classic\WireMock.Net.Console.Net452.Classic.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NETCoreApp2", "examples\WireMock.Net.Console.NETCoreApp2\WireMock.Net.Console.NETCoreApp2.csproj", "{83645809-9E01-4E81-8733-BA9497554ABF}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.RestClient", "src\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj", "{B6269AAC-170A-43D6-8B9A-579DED3D9A96}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Abstractions", "src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj", "{B6269AAC-170A-4346-8B9A-579DED3D9A94}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.StandAlone", "src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj", "{B6269AAC-170A-43D5-8B9A-579DED3D9A95}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.RequestLogTest", "examples\WireMock.Net.Console.RequestLogTest\WireMock.Net.Console.RequestLogTest.csproj", "{A9D039B9-7509-4CF1-9EFD-87EB82998575}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug - Sonar|Any CPU = Debug - Sonar|Any CPU
+		Debug - Sonar|x64 = Debug - Sonar|x64
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
 		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug|x64.Build.0 = Debug|Any CPU
 		{D3804228-91F4-4502-9595-39584E5A01AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D3804228-91F4-4502-9595-39584E5A01AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E5A01AD}.Release|x64.ActiveCfg = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E5A01AD}.Release|x64.Build.0 = Release|Any CPU
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
 		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug|x64.Build.0 = Debug|Any CPU
 		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Release|x64.ActiveCfg = Release|Any CPU
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Release|x64.Build.0 = Release|Any CPU
+		{FE281639-B014-4C8A-96FA-141164A74713}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE281639-B014-4C8A-96FA-141164A74713}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{FE281639-B014-4C8A-96FA-141164A74713}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{FE281639-B014-4C8A-96FA-141164A74713}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
 		{FE281639-B014-4C8A-96FA-141164A74713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FE281639-B014-4C8A-96FA-141164A74713}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE281639-B014-4C8A-96FA-141164A74713}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FE281639-B014-4C8A-96FA-141164A74713}.Debug|x64.Build.0 = Debug|Any CPU
 		{FE281639-B014-4C8A-96FA-141164A74713}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE281639-B014-4C8A-96FA-141164A74713}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE281639-B014-4C8A-96FA-141164A74713}.Release|x64.ActiveCfg = Release|Any CPU
+		{FE281639-B014-4C8A-96FA-141164A74713}.Release|x64.Build.0 = Release|Any CPU
+		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
 		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug|x64.Build.0 = Debug|Any CPU
 		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Release|x64.ActiveCfg = Release|Any CPU
+		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Release|x64.Build.0 = Release|Any CPU
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
 		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug|x64.Build.0 = Debug|Any CPU
 		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Release|x64.ActiveCfg = Release|Any CPU
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Release|x64.Build.0 = Release|Any CPU
+		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
 		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug|x64.Build.0 = Debug|Any CPU
 		{10E16614-61CA-48D8-8BDD-664C13913DED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{10E16614-61CA-48D8-8BDD-664C13913DED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10E16614-61CA-48D8-8BDD-664C13913DED}.Release|x64.ActiveCfg = Release|Any CPU
+		{10E16614-61CA-48D8-8BDD-664C13913DED}.Release|x64.Build.0 = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug|x64.Build.0 = Debug|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|Any CPU.Build.0 = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|x64.ActiveCfg = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|x64.Build.0 = Release|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug - Sonar|x64.Build.0 = Debug|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}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|x64.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
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|x64.ActiveCfg = Release|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|x64.Build.0 = Release|Any CPU
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug - Sonar|x64.ActiveCfg = Debug|x64
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug - Sonar|x64.Build.0 = Debug|x64
 		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|x64.ActiveCfg = Debug|x64
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|x64.Build.0 = Debug|x64
 		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|x64.ActiveCfg = Release|x64
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|x64.Build.0 = Release|x64
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
 		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Release|x64.ActiveCfg = Release|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Release|x64.Build.0 = Release|Any CPU
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug|x64.Build.0 = Debug|Any CPU
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Release|x64.ActiveCfg = Release|Any CPU
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Release|x64.Build.0 = Release|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|x64.Build.0 = Debug|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|x64.ActiveCfg = Release|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|x64.Build.0 = Release|Any CPU
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
 		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug|x64.Build.0 = Debug|Any CPU
 		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Release|x64.ActiveCfg = Release|Any CPU
+		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Release|x64.Build.0 = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|x64.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
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|x64.ActiveCfg = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|x64.Build.0 = Release|Any CPU
+		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
 		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug|x64.Build.0 = Debug|Any CPU
 		{83645809-9E01-4E81-8733-BA9497554ABF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{83645809-9E01-4E81-8733-BA9497554ABF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83645809-9E01-4E81-8733-BA9497554ABF}.Release|x64.ActiveCfg = Release|Any CPU
+		{83645809-9E01-4E81-8733-BA9497554ABF}.Release|x64.Build.0 = Release|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug|x64.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Release|x64.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Release|x64.Build.0 = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug|x64.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Release|x64.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Release|x64.Build.0 = Release|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug|x64.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Release|x64.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Release|x64.Build.0 = Release|Any CPU
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|x64.Build.0 = Debug|Any CPU
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|x64.ActiveCfg = Release|Any CPU
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -146,7 +313,6 @@ Global
 		{FE281639-B014-4C8A-96FA-141164A74713} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{1995E414-F197-4AB4-90C2-68D806B5AF59} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{058D4B6C-C03E-49D0-91DB-A535B058FA0D} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {EF242EDF-7133-4277-9A0C-18744DE08707}
 		{10E16614-61CA-48D8-8BDD-664C13913DED} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{668F689E-57B4-422E-8846-C0FF643CA999} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{049539C1-7A66-4559-AD7A-B1C73B97CBB0} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
@@ -154,10 +320,13 @@ Global
 		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{7F0B2446-0363-4720-AF46-F47F83B557DC} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
-		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{1261BB9B-A7D4-456C-8985-3CE560361B8E} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{668F689E-57B4-422E-8846-C0FF643CA268} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{83645809-9E01-4E81-8733-BA9497554ABF} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96} = {EF242EDF-7133-4277-9A0C-18744DE08707}
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94} = {EF242EDF-7133-4277-9A0C-18744DE08707}
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {EF242EDF-7133-4277-9A0C-18744DE08707}
+		{A9D039B9-7509-4CF1-9EFD-87EB82998575} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BF428BCC-C837-433B-87D2-15C7014B73E9}
--- a/Solution.sln.DotSettings
+++ b/Solution.sln.DotSettings
@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CS/@EntryIndexedValue">CS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
--- a/azure-pipelines-ci-linux.yml
+++ b/azure-pipelines-ci-linux.yml
@@ -0,0 +1,13 @@
+pool:
+  vmImage: 'Ubuntu 16.04'
+
+variables:
+  buildConfiguration: 'Release'
+
+steps:
+- script: |
+    dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration $(buildConfiguration) --framework netcoreapp2.1 --logger trx
+- task: PublishTestResults@2
+  inputs:
+    testRunner: VSTest
+    testResultsFiles: '**/*.trx'
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -1,5 +1,5 @@
 pool:
-  vmImage: 'vs2017-win2016'
+  vmImage: 'windows-2019'

 variables:
  Prerelease: 'ci'
@@ -26,6 +26,7 @@ steps:
 - script: |
    %USERPROFILE%\.dotnet\tools\dotnet-sonarscanner begin /k:"wiremock" /o:"stefh-github" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="$(SONAR_TOKEN)" /v:"$(buildId)" /d:sonar.cs.opencover.reportsPaths="**\coverage.opencover.xml"
  displayName: Begin SonarScanner
+  condition: and(succeeded(), eq(variables['RUN_SONAR'], 'yes'))

 # Build source, tests and run tests for net452 and netcoreapp2.1 (with coverage)
 - script: |
@@ -37,16 +38,20 @@ steps:
 - script: |
    %USERPROFILE%\.dotnet\tools\dotnet-sonarscanner end /d:sonar.login="$(SONAR_TOKEN)"
  displayName: End SonarScanner
+  condition: and(succeeded(), eq(variables['RUN_SONAR'], 'yes'))

 - task: whitesource.ws-bolt.bolt.wss.WhiteSource Bolt@19
  displayName: 'WhiteSource Bolt'
+  condition: and(succeeded(), eq(variables['RUN_WHITESOURCE'], 'yes'))

 # Upload coverage to codecov.io
 - script: |
    %USERPROFILE%\.nuget\packages\codecov\1.1.0\tools\codecov.exe -f "./test/WireMock.Net.Tests/coverage.opencover.xml" -t $(CODECOV_TOKEN)
  displayName: Upload coverage to codecov.io

+# https://github.com/microsoft/azure-pipelines-tasks/issues/12212
 - task: PublishTestResults@2
+  condition: and(succeeded(), eq(variables['PUBLISH_TESTRESULTS'], 'yes'))
  inputs:
    testRunner: VSTest
    testResultsFiles: '**/*.trx'
@@ -76,10 +81,11 @@ steps:
  inputs:
    PathtoPublish: '$(Build.ArtifactStagingDirectory)'

+# https://github.com/NuGet/Home/issues/8148
 - task: DotNetCoreCLI@2
  displayName: Push to MyGet
  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
  inputs:
    command: custom
    custom: nuget
-    arguments: push $(Build.ArtifactStagingDirectory)\packages\*.nupkg --source https://www.myget.org/F/wiremock-net/api/v3/index.json --no-service-endpoint --api-key $(MyGetKey)
+    arguments: push $(Build.ArtifactStagingDirectory)\packages\*.nupkg -n true -s https://www.myget.org/F/wiremock-net/api/v3/index.json -k $(MyGetKey)
--- a/azure-pipelines-linux.yml
+++ b/azure-pipelines-linux.yml
@@ -1,13 +1,23 @@
+trigger:
+- none
+
 pool:
  vmImage: 'Ubuntu 16.04'

 variables:
+  buildProjects: '**/src/**/*.csproj'
  buildConfiguration: 'Release'

 steps:
- script: |
-    dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration $(buildConfiguration) --framework netcoreapp2.1 --logger trx
- task: PublishTestResults@2
+- task: DotNetCoreCLI@2
+  displayName: Build Release
  inputs:
-    testRunner: VSTest
-    testResultsFiles: '**/*.trx'
+    command: 'build'
+    arguments: /p:Configuration=$(buildConfiguration)
+    projects: $(buildProjects)
+
+- task: PublishBuildArtifacts@1
+  displayName: Publish Artifacts
+  condition: succeeded()
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)'
--- a/azure-pipelines-nuget.yml
+++ b/azure-pipelines-nuget.yml
@@ -0,0 +1,46 @@
+pool:
+  vmImage: 'vs2017-win2016'
+
+variables:
+  Prerelease: ''
+  buildId: "1$(Build.BuildId)"
+  buildProjects: '**/src/**/*.csproj'
+
+steps:
+# Print buildId
+- script: |
+    echo "BuildId = $(buildId)"
+  displayName: 'Print buildId'
+
+# Based on https://whereslou.com/2018/09/versioning-and-publishing-nuget-packages-automatically-using-azure-devops-pipelines/
+- task: DotNetCoreCLI@2
+  displayName: Build Release
+  inputs:
+    command: 'build'
+    arguments: /p:Configuration=Release # https://github.com/MicrosoftDocs/vsts-docs/issues/1976
+    projects: $(buildProjects)
+
+- task: DotNetCoreCLI@2
+  displayName: Pack
+  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
+  inputs:
+    command: pack
+    configuration: 'Release'
+    packagesToPack: $(buildProjects)
+    nobuild: true
+    packDirectory: '$(Build.ArtifactStagingDirectory)/packages'
+    verbosityPack: 'normal'
+
+- task: PublishBuildArtifacts@1
+  displayName: Publish Artifacts
+  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+
+- task: DotNetCoreCLI@2
+  displayName: Push to NuGet
+  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
+  inputs:
+    command: custom
+    custom: nuget
+    arguments: push $(Build.ArtifactStagingDirectory)\packages\*.nupkg -n true -s https://api.nuget.org/v3/index.json -k $(NuGetKey)
--- a/examples/WireMock.Net.Client/Program.cs
+++ b/examples/WireMock.Net.Client/Program.cs
@@ -3,44 +3,45 @@ using RestEase;
 using System;
 using System.Net.Http.Headers;
 using System.Text;
+using System.Threading.Tasks;
 using WireMock.Client;

 namespace WireMock.Net.Client
 {
    class Program
    {
-        static void Main(string[] args)
+        static async Task Main(string[] args)
        {
-            // Create an implementation of the IFluentMockServerAdmin and pass in the base URL for the API.
-            var api = RestClient.For<IFluentMockServerAdmin>("http://localhost:9091");
+            // Create an implementation of the IWireMockAdminApi and pass in the base URL for the API.
+            var api = RestClient.For<IWireMockAdminApi>("http://localhost:9091");

            // Set BASIC Auth
            var value = Convert.ToBase64String(Encoding.ASCII.GetBytes("a:b"));
            api.Authorization = new AuthenticationHeaderValue("Basic", value);

-            var settings1 = api.GetSettingsAsync().Result;
+            var settings1 = await api.GetSettingsAsync();
            Console.WriteLine($"settings1 = {JsonConvert.SerializeObject(settings1)}");

            settings1.GlobalProcessingDelay = 1077;
            api.PostSettingsAsync(settings1).Wait();

-            var settings2 = api.GetSettingsAsync().Result;
+            var settings2 = await api.GetSettingsAsync();
            Console.WriteLine($"settings2 = {JsonConvert.SerializeObject(settings2)}");

-            var mappings = api.GetMappingsAsync().Result;
+            var mappings = await api.GetMappingsAsync();
            Console.WriteLine($"mappings = {JsonConvert.SerializeObject(mappings)}");

            try
            {
                var guid = Guid.Parse("11111110-a633-40e8-a244-5cb80bc0ab66");
-                var mapping = api.GetMappingAsync(guid).Result;
+                var mapping = await api.GetMappingAsync(guid);
                Console.WriteLine($"mapping = {JsonConvert.SerializeObject(mapping)}");
            }
            catch (Exception e)
            {
            }

-            var request = api.GetRequestsAsync().Result;
+            var request = await api.GetRequestsAsync();
            Console.WriteLine($"request = {JsonConvert.SerializeObject(request)}");

            //var deleteRequestsAsync = api.DeleteRequestsAsync().Result;
@@ -49,15 +50,21 @@ namespace WireMock.Net.Client
            //var resetRequestsAsync = api.ResetRequestsAsync().Result;
            //Console.WriteLine($"ResetRequestsAsync = {resetRequestsAsync.Status}");

-            var scenarioStates = api.GetScenariosAsync().Result;
+            var scenarioStates = await api.GetScenariosAsync();
            Console.WriteLine($"GetScenariosAsync = {JsonConvert.SerializeObject(scenarioStates)}");

-            var postFileResult = api.PostFileAsync("1.cs", "C# Hello").GetAwaiter().GetResult();
+            var postFileResult = await api.PostFileAsync("1.cs", "C# Hello");
            Console.WriteLine($"postFileResult = {JsonConvert.SerializeObject(postFileResult)}");

-            var getFileResult = api.GetFileAsync("1.cs").GetAwaiter().GetResult();
+            var getFileResult = await api.GetFileAsync("1.cs");
            Console.WriteLine($"getFileResult = {getFileResult}");

+            var resetMappingsAsync = await api.ResetMappingsAsync();
+            Console.WriteLine($"resetMappingsAsync = {resetMappingsAsync.Status}");
+
+            var resetMappingsAndReloadStaticMappingsAsync = await api.ResetMappingsAsync(true);
+            Console.WriteLine($"resetMappingsAndReloadStaticMappingsAsync = {resetMappingsAndReloadStaticMappingsAsync.Status}");
+
            Console.WriteLine("Press any key to quit");
            Console.ReadKey();
        }
--- a/examples/WireMock.Net.Client/WireMock.Net.Client.csproj
+++ b/examples/WireMock.Net.Client/WireMock.Net.Client.csproj
@@ -2,18 +2,19 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <!-- <RuntimeFrameworkVersion>1.0.1</RuntimeFrameworkVersion> -->
+    <TargetFramework>netcoreapp2.1</TargetFramework>
    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="RestEase" Version="1.4.7" />
+    <PackageReference Include="RestEase" Version="1.4.10" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj" />
+    <!--<ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />-->
  </ItemGroup>

 </Project>
--- a/examples/WireMock.Net.Console.HeadersTest/Program.cs
+++ b/examples/WireMock.Net.Console.HeadersTest/Program.cs
@@ -1,60 +0,0 @@
-using System.IO;
-using System.Reflection;
-using log4net;
-using log4net.Config;
-using log4net.Repository;
-using Newtonsoft.Json;
-using WireMock.Logging;
-using WireMock.RequestBuilders;
-using WireMock.ResponseBuilders;
-using WireMock.Server;
-using WireMock.Settings;
-
-namespace WireMock.Net.Console.NETCoreApp
-{
-    static class Program
-    {
-        private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
-        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
-
-        static void Main(params string[] args)
-        {
-            XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));
-
-            string url = "http://localhost:9999/";
-
-            var server = FluentMockServer.Start(new FluentMockServerSettings
-            {
-                Urls = new[] { url },
-                StartAdminInterface = true,
-                Logger = new WireMockConsoleLogger()
-            });
-            System.Console.WriteLine("FluentMockServer listening at {0}", string.Join(",", server.Urls));
-
-            server.SetBasicAuthentication("a", "b");
-
-            server.AllowPartialMapping();
-
-            server
-                .Given(Request.Create()
-                    .UsingGet()
-                    .WithHeader("Keep-Alive-Test", "stef")
-                )
-                .RespondWith(Response.Create()
-                    .WithHeader("Keep-Alive", "timeout=1, max=1")
-                    .WithBody("Keep-Alive OK")
-                );
-
-            System.Console.WriteLine("Press any key to stop the server");
-            System.Console.ReadKey();
-            server.Stop();
-
-            System.Console.WriteLine("Displaying all requests");
-            var allRequests = server.LogEntries;
-            System.Console.WriteLine(JsonConvert.SerializeObject(allRequests, Formatting.Indented));
-
-            System.Console.WriteLine("Press any key to quit");
-            System.Console.ReadKey();
-        }
-    }
-}
--- a/examples/WireMock.Net.Console.HeadersTest/WireMock.Net.Console.HeadersTest.csproj
+++ b/examples/WireMock.Net.Console.HeadersTest/WireMock.Net.Console.HeadersTest.csproj
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
-    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="log4net" Version="2.0.8" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="log4net.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="nlog.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
--- a/examples/WireMock.Net.Console.HeadersTest/log4net.config
+++ b/examples/WireMock.Net.Console.HeadersTest/log4net.config
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
-  </configSections>
-  <appSettings>
-    <add key="log4net.Internal.Debug" value="true"/>
-  </appSettings>
-  <log4net>
-    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
-      </layout>
-    </appender>
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="ConsoleAppender" />
-    </root>
-  </log4net>
-</configuration>
--- a/examples/WireMock.Net.Console.HeadersTest/nlog.config
+++ b/examples/WireMock.Net.Console.HeadersTest/nlog.config
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      autoReload="true"
-      internalLogLevel="info"
-      internalLogFile="c:\temp\wiremock-internal-nlog.log">
-
-  <targets>
-    <!-- write logs to file  -->
-    <target xsi:type="File" name="all" fileName="c:\temp\wiremock-${shortdate}.log"
-            layout="${longdate}|${event-properties:item=EventId.Id}|${uppercase:${level}}|${logger}|${message} ${exception}" />
-  </targets>
-
-  <!-- rules to map from logger name to target -->
-  <rules>
-    <logger name="*" minlevel="Debug" writeTo="all" />
-  </rules>
-</nlog>
--- a/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj
@@ -19,6 +19,7 @@

  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
    <PackageReference Include="log4net" Version="2.0.8" />
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
  </ItemGroup>
--- a/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj
@@ -18,12 +18,17 @@
    </Content>
  </ItemGroup>

+  <ItemGroup>
+    <Compile Remove="__admin\mappings\1.cs" />
+  </ItemGroup>
+
  <ItemGroup>
    <None Remove="__admin\mappings\array.json" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
    <PackageReference Include="log4net" Version="2.0.8" />
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
  </ItemGroup>
--- a/examples/WireMock.Net.Console.NETCoreApp2/__admin/mappings/1.cs
+++ b/examples/WireMock.Net.Console.NETCoreApp2/__admin/mappings/1.cs
@@ -0,0 +1 @@
+// C# Hello
--- a/examples/WireMock.Net.Console.Net452.Classic/CustomFileSystemFileHandler.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/CustomFileSystemFileHandler.cs
@@ -21,9 +21,9 @@ namespace WireMock.Net.ConsoleApplication
        }

        /// <inheritdoc cref="IFileSystemHandler.EnumerateFiles"/>
-        public IEnumerable<string> EnumerateFiles(string path)
+        public IEnumerable<string> EnumerateFiles(string path, bool includeSubdirectories)
        {
-            return Directory.EnumerateFiles(path);
+            return includeSubdirectories ? Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories) : Directory.EnumerateFiles(path);
        }

        /// <inheritdoc cref="IFileSystemHandler.GetMappingFolder"/>
--- a/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
@@ -1,6 +1,9 @@
 using Newtonsoft.Json;
+using HandlebarsDotNet;
 using System;
+using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
 using System.Net;
 using WireMock.Logging;
 using WireMock.Matchers;
@@ -11,6 +14,23 @@ using WireMock.Settings;

 namespace WireMock.Net.ConsoleApplication
 {
+    public interface IHandleBarTransformer
+    {
+        string Name { get; }
+
+        void Render(TextWriter textWriter, dynamic context, object[] arguments);
+    }
+
+    public class CustomNameTransformer : IHandleBarTransformer
+    {
+        public string Name => "CustomName";
+
+        public void Render(TextWriter writer, dynamic context, object[] parameters)
+        {
+            /* Handlebar logic to render */
+        }
+    }
+
    public static class MainApp
    {
        public static void Run()
@@ -19,12 +39,14 @@ namespace WireMock.Net.ConsoleApplication
            string url2 = "http://localhost:9092/";
            string url3 = "https://localhost:9443/";

-            var server = FluentMockServer.Start(new FluentMockServerSettings
+            var server = WireMockServer.Start(new WireMockServerSettings
            {
+                AllowCSharpCodeMatcher = true,
                Urls = new[] { url1, url2, url3 },
                StartAdminInterface = true,
                ReadStaticMappings = true,
                WatchStaticMappings = true,
+                WatchStaticMappingsInSubdirectories = true,
                //ProxyAndRecordSettings = new ProxyAndRecordSettings
                //{
                //    SaveMapping = true
@@ -33,10 +55,18 @@ namespace WireMock.Net.ConsoleApplication
                PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); },
                Logger = new WireMockConsoleLogger(),

+                HandlebarsRegistrationCallback = (handlebarsContext, fileSystemHandler) =>
+                {
+                    var transformer = new CustomNameTransformer();
+                    handlebarsContext.RegisterHelper(transformer.Name, transformer.Render);
+                },
+
+                AllowAnyHttpStatusCodeInResponse = true
+
                // Uncomment below if you want to use the CustomFileSystemFileHandler
                // FileSystemHandler = new CustomFileSystemFileHandler()
            });
-            System.Console.WriteLine("FluentMockServer listening at {0}", string.Join(",", server.Urls));
+            System.Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));

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

@@ -77,6 +107,24 @@ namespace WireMock.Net.ConsoleApplication
                    .WithProxy(new ProxyAndRecordSettings { Url = "http://postman-echo.com/get" })
                );

+            server
+                .Given(Request.Create()
+                    .UsingGet()
+                    .WithHeader("postmanecho", "get2")
+                )
+                .RespondWith(Response.Create()
+                    .WithProxy(new ProxyAndRecordSettings
+                    {
+                        Url = "http://postman-echo.com/get",
+                        WebProxySettings = new WebProxySettings
+                        {
+                            Address = "http://company",
+                            UserName = "test",
+                            Password = "pwd"
+                        }
+                    })
+                );
+
            server
                .Given(Request.Create()
                    .UsingGet()
@@ -422,6 +470,7 @@ namespace WireMock.Net.ConsoleApplication
                        DateTimeNowToString = DateTime.Now.ToString("s", CultureInfo.InvariantCulture),
                        Guid1 = "{{Random Type=\"Guid\" Uppercase=false}}",
                        Guid2 = "{{Random Type=\"Guid\"}}",
+                        Guid3 = "{{Random Type=\"Guid\" Format=\"X\"}}",
                        Boolean = "{{Random Type=\"Boolean\"}}",
                        Integer = "{{Random Type=\"Integer\" Min=1000 Max=9999}}",
                        Long = "{{#Random Type=\"Long\" Min=10000000 Max=99999999}}{{this}}{{/Random}}",
--- a/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj
@@ -36,6 +36,9 @@
    <ApplicationIcon>..\..\WireMock.Net-Logo.ico</ApplicationIcon>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="Handlebars, Version=1.9.5.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.1.9.5\lib\net452\Handlebars.dll</HintPath>
+    </Reference>
    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
    </Reference>
@@ -77,9 +80,9 @@
    </None>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
-      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
-      <Name>WireMock.Net.StandAlone</Name>
+    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
+      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
+      <Name>WireMock.Net.Abstractions</Name>
    </ProjectReference>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
--- a/examples/WireMock.Net.Console.Net452.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net452.Classic/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Handlebars.Net" version="1.9.5" targetFramework="net452" />
  <package id="log4net" version="2.0.8" targetFramework="net452" />
  <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
--- a/examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj
@@ -35,6 +35,9 @@
    <StartupObject>WireMock.Net.ConsoleApplication.Program</StartupObject>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="Handlebars, Version=1.9.5.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.1.9.5\lib\net452\Handlebars.dll</HintPath>
+    </Reference>
    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
    </Reference>
@@ -73,9 +76,9 @@
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
-      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
-      <Name>WireMock.Net.StandAlone</Name>
+    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
+      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
+      <Name>WireMock.Net.Abstractions</Name>
    </ProjectReference>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
--- a/examples/WireMock.Net.Console.Net461.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net461.Classic/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Handlebars.Net" version="1.9.5" targetFramework="net461" />
  <package id="log4net" version="2.0.8" targetFramework="net461" />
  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
--- a/examples/WireMock.Net.Console.Proxy.NETCoreApp2/Program.cs
+++ b/examples/WireMock.Net.Console.Proxy.NETCoreApp2/Program.cs
@@ -17,7 +17,7 @@ namespace WireMock.Net.Console.Proxy.NETCoreApp2
            RunTestDifferentPort().Wait(20000); // prints "1"
            RunTestDifferentPort().Wait(20000); // prints "1"

-            var server = FluentMockServer.Start(new FluentMockServerSettings
+            var server = WireMockServer.Start(new WireMockServerSettings
            {
                Urls = new[] { "http://localhost:9091", "https://localhost:9443" },
                StartAdminInterface = true,
@@ -44,7 +44,7 @@ namespace WireMock.Net.Console.Proxy.NETCoreApp2

        private static async Task RunTestDifferentPort()
        {
-            var server = FluentMockServer.Start();
+            var server = WireMockServer.Start();

            server.Given(Request.Create().WithPath("/").UsingGet())
                .RespondWith(Response.Create().WithStatusCode(200).WithBody("Hello"));
--- a/examples/WireMock.Net.Console.Proxy.NETCoreApp2/WireMock.Net.Console.Proxy.NETCoreApp2.csproj
+++ b/examples/WireMock.Net.Console.Proxy.NETCoreApp2/WireMock.Net.Console.Proxy.NETCoreApp2.csproj
@@ -11,7 +11,6 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj" />
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
  </ItemGroup>

--- a/examples/WireMock.Net.Console.Proxy.Net452/Program.cs
+++ b/examples/WireMock.Net.Console.Proxy.Net452/Program.cs
@@ -11,7 +11,7 @@ namespace WireMock.Net.Console.Proxy.Net452
        static void Main(string[] args)
        {
            string[] urls = { "http://localhost:9091/", "https://localhost:9443/" };
-            var server = FluentMockServer.Start(new FluentMockServerSettings
+            var server = WireMockServer.Start(new WireMockServerSettings
            {
                Urls = urls,
                StartAdminInterface = true,
--- a/examples/WireMock.Net.Console.Proxy.Net452/WireMock.Net.Console.Proxy.Net452.csproj
+++ b/examples/WireMock.Net.Console.Proxy.Net452/WireMock.Net.Console.Proxy.Net452.csproj
@@ -92,10 +92,6 @@
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
-      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
-      <Name>WireMock.Net.StandAlone</Name>
-    </ProjectReference>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
      <Name>WireMock.Net</Name>
--- a/examples/WireMock.Net.Console.Record.NETCoreApp/Program.cs
+++ b/examples/WireMock.Net.Console.Record.NETCoreApp/Program.cs
@@ -8,7 +8,7 @@ namespace WireMock.Net.Console.Proxy.NETCoreApp
    {
        static void Main(params string[] args)
        {
-            var server = FluentMockServer.Start(new FluentMockServerSettings
+            var server = WireMockServer.Start(new WireMockServerSettings
            {
                Urls = new[] { "http://localhost:9091/", "https://localhost:9443/" },
                StartAdminInterface = true,
--- a/examples/WireMock.Net.Console.Record.NETCoreApp/WireMock.Net.Console.Proxy.NETCoreApp.csproj
+++ b/examples/WireMock.Net.Console.Record.NETCoreApp/WireMock.Net.Console.Proxy.NETCoreApp.csproj
@@ -8,6 +8,7 @@

  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
  </ItemGroup>

--- a/examples/WireMock.Net.Console.RequestLogTest/Program.cs
+++ b/examples/WireMock.Net.Console.RequestLogTest/Program.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using WireMock.Logging;
+using WireMock.Net.StandAlone;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Settings;
+
+namespace WireMock.Net.Console.RequestLogTest
+{
+    class Program
+    {
+        static async Task Main(string[] args)
+        {
+            var server = StandAloneApp.Start(new FluentMockServerSettings
+            {
+                Port = 19019,
+                StartAdminInterface = true,
+                StartTimeout = 1000,
+                MaxRequestLogCount = 100,
+                RequestLogExpirationDuration = 6,
+                Logger = new WireMockConsoleLogger()
+            });
+
+            server
+                .Given(Request
+                    .Create()
+                    .UsingGet())
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBodyAsJson(new { result = "x" }));
+
+            await Task.Delay(2000);
+
+            var client = new HttpClient();
+            client.BaseAddress = new Uri(server.Urls[0]);
+
+            var options = new ParallelOptions()
+            {
+                MaxDegreeOfParallelism = 2
+            };
+
+            var list = Enumerable.Range(1, 1000);
+            Parallel.ForEach(list, options, async i =>
+            {
+                string result = await client.GetStringAsync("/x");
+                System.Console.WriteLine(result);
+            });
+
+            //for (int i = 0; i < 1000; i++)
+            //{
+            //    string result = await client.GetStringAsync("/x");
+            //    System.Console.WriteLine(result);
+            //}
+
+            System.Console.WriteLine("Press any key to stop the server");
+            System.Console.ReadKey();
+            server.Stop();
+        }
+    }
+}
--- a/examples/WireMock.Net.Console.RequestLogTest/WireMock.Net.Console.RequestLogTest.csproj
+++ b/examples/WireMock.Net.Console.RequestLogTest/WireMock.Net.Console.RequestLogTest.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj" />
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/examples/WireMock.Net.Service/Program.cs
+++ b/examples/WireMock.Net.Service/Program.cs
@@ -3,7 +3,6 @@ using System;
 using System.IO;
 using System.ServiceProcess;
 using WireMock.Net.Service;
-using WireMock.Net.StandAlone;
 using WireMock.Server;
 using WireMock.Settings;

@@ -12,7 +11,7 @@ namespace Wiremock.Net.Service
    public static class Program
    {
        #region Nested classes to support running as service
-        public const string ServiceName = "Wiremock.Net.Service";
+        public const string ServiceName = "WireMock.Net.Service";

        public class Service : ServiceBase
        {
@@ -33,7 +32,7 @@ namespace Wiremock.Net.Service
        }
        #endregion

-        private static FluentMockServer _server;
+        private static WireMockServer _server;

        static void Main(string[] args)
        {
@@ -64,7 +63,7 @@ namespace Wiremock.Net.Service

        private static void Start()
        {
-            _server = StandAloneApp.Start(new FluentMockServerSettings
+            _server = WireMockServer.Start(new WireMockServerSettings
            {
                Urls = new[] { "http://*:9091/" },
                StartAdminInterface = true,
--- a/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
+++ b/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
@@ -47,18 +47,12 @@
    <Reference Include="Microsoft.Owin.Hosting, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Owin.Hosting.2.0.2\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
    </Reference>
-    <Reference Include="MimeKitLite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MimeKitLite.2.0.1\lib\net45\MimeKitLite.dll</HintPath>
-    </Reference>
    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
    </Reference>
-    <Reference Include="RestEase, Version=1.4.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\RestEase.1.4.7\lib\net45\RestEase.dll</HintPath>
-    </Reference>
    <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
    </Reference>
@@ -86,8 +80,8 @@
    <Reference Include="System.Data" />
    <Reference Include="System.Net.Http" />
    <Reference Include="System.Xml" />
-    <Reference Include="XPath2, Version=1.0.7.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XPath2.1.0.6.1\lib\net40\XPath2.dll</HintPath>
+    <Reference Include="XPath2, Version=1.0.9.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XPath2.1.0.10\lib\net40\XPath2.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
@@ -121,9 +115,9 @@
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
-      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
-      <Name>WireMock.Net.StandAlone</Name>
+    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
+      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
+      <Name>WireMock.Net.Abstractions</Name>
    </ProjectReference>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
--- a/examples/WireMock.Net.Service/WireMockLog4NetLogger.cs
+++ b/examples/WireMock.Net.Service/WireMockLog4NetLogger.cs
@@ -1,4 +1,5 @@
-using log4net;
+using System;
+using log4net;
 using Newtonsoft.Json;
 using Wiremock.Net.Service;
 using WireMock.Admin.Requests;
@@ -30,6 +31,11 @@ namespace WireMock.Net.Service
            Log.ErrorFormat(formatString, args);
        }

+        public void Error(string message, Exception exception)
+        {
+            Log.Error(message, exception);
+        }
+
        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
        {
            string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
--- a/examples/WireMock.Net.Service/packages.config
+++ b/examples/WireMock.Net.Service/packages.config
@@ -9,11 +9,9 @@
  <package id="Microsoft.Owin" version="2.0.2" targetFramework="net452" />
  <package id="Microsoft.Owin.Host.HttpListener" version="2.0.2" targetFramework="net452" />
  <package id="Microsoft.Owin.Hosting" version="2.0.2" targetFramework="net452" />
-  <package id="MimeKitLite" version="2.0.1" targetFramework="net452" />
  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
  <package id="Owin" version="1.0" targetFramework="net452" />
-  <package id="RestEase" version="1.4.7" targetFramework="net452" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
  <package id="System.Net.Http" version="4.3.3" targetFramework="net452" />
-  <package id="XPath2" version="1.0.6.1" targetFramework="net452" />
+  <package id="XPath2" version="1.0.10" targetFramework="net452" />
 </packages>
--- a/examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs
@@ -1,11 +1,13 @@
 using System;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
 using log4net;
 using log4net.Config;
 using log4net.Repository;
 using WireMock.Server;
+using WireMock.Settings;

 namespace WireMock.Net.StandAlone.NETCoreApp
 {
@@ -15,13 +17,16 @@ namespace WireMock.Net.StandAlone.NETCoreApp
        // private static readonly ILog Log = LogManager.GetLogger(typeof(Program));

        private static int sleepTime = 30000;
-        private static FluentMockServer _server;
+        private static WireMockServer _server;

        static void Main(string[] args)
        {
            XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));

-            _server = StandAloneApp.Start(args, new WireMockLog4NetLogger());
+            var settings = WireMockServerSettingsParser.ParseArguments(args, new WireMockLog4NetLogger());
+            settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+
+            _server = WireMockServer.Start(settings);

            Console.WriteLine($"{DateTime.UtcNow} Press Ctrl+C to shut down");

--- a/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
    <StartupObject>WireMock.Net.StandAlone.NETCoreApp.Program</StartupObject>
  </PropertyGroup>
@@ -12,7 +12,8 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj" />
+    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
  </ItemGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.StandAlone.NETCoreApp/WireMockLog4NetLogger.cs
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/WireMockLog4NetLogger.cs
@@ -1,4 +1,5 @@
-using log4net;
+using System;
+using log4net;
 using Newtonsoft.Json;
 using WireMock.Admin.Requests;
 using WireMock.Logging;
@@ -29,6 +30,11 @@ namespace WireMock.Net.StandAlone.NETCoreApp
            Log.ErrorFormat(formatString, args);
        }

+        public void Error(string message, Exception exception)
+        {
+            Log.Error(message, exception);
+        }
+
        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
        {
            string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
--- a/examples/WireMock.Net.StandAlone.Net452/Program.cs
+++ b/examples/WireMock.Net.StandAlone.Net452/Program.cs
@@ -1,6 +1,9 @@
 using System;
 using System.IO;
+using System.Linq;
 using log4net.Config;
+using WireMock.Server;
+using WireMock.Settings;

 namespace WireMock.Net.StandAlone.Net452
 {
@@ -10,7 +13,10 @@ namespace WireMock.Net.StandAlone.Net452
        {
            XmlConfigurator.Configure(new FileInfo("log4net.config"));

-            StandAloneApp.Start(args);
+            var settings = WireMockServerSettingsParser.ParseArguments(args);
+            settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+
+            WireMockServer.Start(settings);

            Console.WriteLine("Press any key to stop the server");
            Console.ReadKey();
--- a/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj
+++ b/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj
@@ -70,9 +70,9 @@
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
-      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
-      <Name>WireMock.Net.StandAlone</Name>
+    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
+      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
+      <Name>WireMock.Net.Abstractions</Name>
    </ProjectReference>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
--- a/examples/WireMock.Net.StandAlone.Net461/Program.cs
+++ b/examples/WireMock.Net.StandAlone.Net461/Program.cs
@@ -1,6 +1,7 @@
 using System;
-using WireMock.RequestBuilders;
-using WireMock.ResponseBuilders;
+using System.Linq;
+using WireMock.Server;
+using WireMock.Settings;

 namespace WireMock.Net.StandAlone.Net461
 {
@@ -8,9 +9,10 @@ namespace WireMock.Net.StandAlone.Net461
    {
        static void Main(string[] args)
        {
-            var server = StandAloneApp.Start(args);
-            server.Given(Request.Create())
-                .RespondWith(Response.Create().WithProxy("http://10.10.66.65"));
+            var settings = WireMockServerSettingsParser.ParseArguments(args);
+            settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+
+            WireMockServer.Start(settings);

            Console.WriteLine("Press any key to stop the server");
            Console.ReadKey();
--- a/examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj
+++ b/examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj
@@ -204,8 +204,8 @@
    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
    </Reference>
-    <Reference Include="RestEase, Version=1.4.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\RestEase.1.4.7\lib\net45\RestEase.dll</HintPath>
+    <Reference Include="RestEase, Version=1.4.10.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\RestEase.1.4.10\lib\net45\RestEase.dll</HintPath>
    </Reference>
    <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
@@ -231,6 +231,7 @@
    <Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>
    </Reference>
+    <Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
    <Reference Include="System.Net.Http.Formatting, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.4\lib\net45\System.Net.Http.Formatting.dll</HintPath>
    </Reference>
@@ -279,12 +280,6 @@
    </Reference>
    <Reference Include="System.Xml" />
    <Reference Include="System.Xml.Linq" />
-    <Reference Include="WireMock.Net, Version=1.0.4.20, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\WireMock.Net.1.0.4.20\lib\net461\WireMock.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="WireMock.Net.StandAlone, Version=1.0.4.20, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\WireMock.Net.StandAlone.1.0.4.20\lib\net46\WireMock.Net.StandAlone.dll</HintPath>
-    </Reference>
    <Reference Include="XPath2, Version=1.0.7.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
      <HintPath>..\..\packages\XPath2.1.0.6.1\lib\net40\XPath2.dll</HintPath>
    </Reference>
@@ -301,6 +296,16 @@
      <SubType>Designer</SubType>
    </None>
  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
+      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
+      <Name>WireMock.Net.Abstractions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
+      <Project>{D3804228-91F4-4502-9595-39584E5A01AD}</Project>
+      <Name>WireMock.Net</Name>
+    </ProjectReference>
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
--- a/examples/WireMock.Net.StandAlone.Net461/packages.config
+++ b/examples/WireMock.Net.StandAlone.Net461/packages.config
@@ -59,7 +59,7 @@
  <package id="MimeKitLite" version="2.0.7" targetFramework="net461" />
  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
  <package id="Owin" version="1.0" targetFramework="net461" />
-  <package id="RestEase" version="1.4.7" targetFramework="net461" />
+  <package id="RestEase" version="1.4.10" targetFramework="net461" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
  <package id="System.Buffers" version="4.5.0" targetFramework="net461" />
  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
@@ -78,7 +78,5 @@
  <package id="System.Security.Principal.Windows" version="4.5.1" targetFramework="net461" />
  <package id="System.Text.Encodings.Web" version="4.5.0" targetFramework="net461" />
  <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
-  <package id="WireMock.Net" version="1.0.4.20" targetFramework="net461" />
-  <package id="WireMock.Net.StandAlone" version="1.0.4.20" targetFramework="net461" />
  <package id="XPath2" version="1.0.6.1" targetFramework="net461" />
 </packages>
--- a/examples/WireMock.Net.WebApplication/Program.cs
+++ b/examples/WireMock.Net.WebApplication/Program.cs
@@ -43,9 +43,9 @@ namespace WireMock.Net.WebApplication
            // Add access to generic IConfigurationRoot
            serviceCollection.AddSingleton(configuration);

-            // Add access to IFluentMockServerSettings
-            var settings = configuration.GetSection("FluentMockServerSettings").Get<FluentMockServerSettings>();
-            serviceCollection.AddSingleton<IFluentMockServerSettings>(settings);
+            // Add access to WireMockServerSettings
+            var settings = configuration.GetSection("WireMockServerSettings").Get<WireMockServerSettings>();
+            serviceCollection.AddSingleton<WireMockServerSettings>(settings);

            // Add services
            serviceCollection.AddTransient<IWireMockService, WireMockService>();
--- a/examples/WireMock.Net.WebApplication/WireMock.Net.WebApplication.NETCore2.csproj
+++ b/examples/WireMock.Net.WebApplication/WireMock.Net.WebApplication.NETCore2.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
    <StartupObject>WireMock.Net.WebApplication.Program</StartupObject>
    <AssemblyName>WireMock.Net.WebApplication</AssemblyName>
@@ -11,18 +11,18 @@

  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0'">
    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.9" />
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
  </ItemGroup>

  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1'">
    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.5" />
+    <PackageReference Include="Microsoft.AspNetCore.All" />
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj" />
+    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
  </ItemGroup>

--- a/examples/WireMock.Net.WebApplication/WireMockService.cs
+++ b/examples/WireMock.Net.WebApplication/WireMockService.cs
@@ -1,9 +1,9 @@
 using System.Threading;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
-using WireMock.Admin.Requests;
 using WireMock.Logging;
-using WireMock.Net.StandAlone;
+using WireMock.Models.Requests;
+using WireMock.Server;
 using WireMock.Settings;

 namespace WireMock.Net.WebApplication
@@ -13,7 +13,7 @@ namespace WireMock.Net.WebApplication
        private static int sleepTime = 30000;

        private readonly ILogger _logger;
-        private readonly IFluentMockServerSettings _settings;
+        private readonly WireMockServerSettings _settings;

        private class Logger : IWireMockLogger
        {
@@ -51,7 +51,7 @@ namespace WireMock.Net.WebApplication
            }
        }

-        public WireMockService(ILogger logger, IFluentMockServerSettings settings)
+        public WireMockService(ILogger logger, WireMockServerSettings settings)
        {
            _logger = logger;
            _settings = settings;
@@ -63,7 +63,7 @@ namespace WireMock.Net.WebApplication
        {
            _logger.LogInformation("WireMock.Net server starting");

-            StandAloneApp.Start(_settings);
+            WireMockServer.Start(_settings);

            _logger.LogInformation($"WireMock.Net server settings {JsonConvert.SerializeObject(_settings)}");

--- a/examples/WireMock.Net.WebApplication/appsettings.json
+++ b/examples/WireMock.Net.WebApplication/appsettings.json
@@ -12,7 +12,7 @@
      }
    }
  },
-  "FluentMockServerSettings": {
+  "WireMockServerSettings": {
    "AdminUsername": "a",
    "AdminPassword": "b",
    "StartAdminInterface": true
--- a/resources/MyGet-Config.png
+++ b/resources/MyGet-Config.png
--- a/resources/MyGet-Use.png
+++ b/resources/MyGet-Use.png
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/BodyModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/BodyModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/ClientIPModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/ClientIPModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/CookieModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/CookieModel.cs
@@ -16,5 +16,15 @@ namespace WireMock.Admin.Mappings
        /// Gets or sets the matchers.
        /// </summary>
        public IList<MatcherModel> Matchers { get; set; }
+
+        /// <summary>
+        /// Gets or sets the ignore case.
+        /// </summary>
+        public bool? IgnoreCase { get; set; }
+
+        /// <summary>
+        /// Reject on match.
+        /// </summary>
+        public bool? RejectOnMatch { get; set; }
    }
 }
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/EncodingModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/EncodingModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/FaultModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/FaultModel.cs
@@ -0,0 +1,18 @@
+namespace WireMock.Admin.Mappings
+{
+    /// <summary>
+    /// Fault Model
+    /// </summary>
+    public class FaultModel
+    {
+        /// <summary>
+        /// Gets or sets the fault. Can be null, "", NONE, EMPTY_RESPONSE, MALFORMED_RESPONSE_CHUNK or RANDOM_DATA_THEN_CLOSE.
+        /// </summary>
+        public string Type { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fault percentage.
+        /// </summary>
+        public double? Percentage { get; set; }
+    }
+}
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/HeaderModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/HeaderModel.cs
@@ -16,5 +16,15 @@ namespace WireMock.Admin.Mappings
        /// Gets or sets the matchers.
        /// </summary>
        public IList<MatcherModel> Matchers { get; set; }
+
+        /// <summary>
+        /// Gets or sets the ignore case.
+        /// </summary>
+        public bool? IgnoreCase { get; set; }
+
+        /// <summary>
+        /// Reject on match.
+        /// </summary>
+        public bool? RejectOnMatch { get; set; }
    }
 }
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/ParamModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/ParamModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/PathModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/PathModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/RequestModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/RequestModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/ResponseModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/ResponseModel.cs
@@ -10,7 +10,7 @@ namespace WireMock.Admin.Mappings
        /// <summary>
        /// Gets or sets the HTTP status.
        /// </summary>
-        public int? StatusCode { get; set; }
+        public object StatusCode { get; set; }

        /// <summary>
        /// Gets or sets the body destination (SameAsSource, String or Bytes).
@@ -22,11 +22,6 @@ namespace WireMock.Admin.Mappings
        /// </summary>
        public string Body { get; set; }

-        /// <summary>
-        /// Gets or sets the body.
-        /// </summary>
-        public string BodyFromBase64 { get; set; }
-
        /// <summary>
        /// Gets or sets the body (as JSON object).
        /// </summary>
@@ -62,6 +57,11 @@ namespace WireMock.Admin.Mappings
        /// </summary>
        public bool? UseTransformer { get; set; }

+        /// <summary>
+        /// Use the Handlerbars transformer for the content from the referenced BodyAsFile.
+        /// </summary>
+        public bool? UseTransformerForBodyAsFile { get; set; }
+
        /// <summary>
        /// Gets or sets the headers.
        /// </summary>
@@ -86,5 +86,15 @@ namespace WireMock.Admin.Mappings
        /// The client X509Certificate2 Thumbprint or SubjectName to use.
        /// </summary>
        public string X509Certificate2ThumbprintOrSubjectName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fault.
+        /// </summary>
+        public FaultModel Fault { get; set; }
+
+        /// <summary>
+        /// Gets or sets the WebProxy settings.
+        /// </summary>
+        public WebProxyModel WebProxy { get; set; }
    }
 }
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/StatusModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/StatusModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/UrlModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/UrlModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/WebProxyModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/WebProxyModel.cs
@@ -0,0 +1,23 @@
+namespace WireMock.Admin.Mappings
+{
+    /// <summary>
+    /// WebProxy settings
+    /// </summary>
+    public class WebProxyModel
+    {
+        /// <summary>
+        /// A string instance that contains the address of the proxy server.
+        /// </summary>
+        public string Address { get; set; }
+
+        /// <summary>
+        /// The user name associated with the credentials.
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// The password for the user name associated with the credentials.
+        /// </summary>
+        public string Password { get; set; }
+    }
+}
--- a/src/WireMock.Net.Abstractions/Admin/Requests/LogEntryModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Requests/LogEntryModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestMatchModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestMatchModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using WireMock.Admin.Mappings;
-using WireMock.Util;
+using WireMock.Types;

 namespace WireMock.Admin.Requests
 {
--- a/src/WireMock.Net.Abstractions/Admin/Requests/LogResponseModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Requests/LogResponseModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using WireMock.Admin.Mappings;
-using WireMock.Util;
+using WireMock.Types;

 namespace WireMock.Admin.Requests
 {
@@ -12,7 +12,7 @@ namespace WireMock.Admin.Requests
        /// <summary>
        /// Gets or sets the status code.
        /// </summary>
-        public int StatusCode { get; set; } = 200;
+        public object StatusCode { get; set; } = 200;

        /// <summary>
        /// Gets the headers.
@@ -68,5 +68,15 @@ namespace WireMock.Admin.Requests
        /// The detected body type (detection based on Content-Type).
        /// </summary>
        public BodyType DetectedBodyTypeFromContentType { get; set; }
+
+        /// <summary>
+        /// The FaultType.
+        /// </summary>
+        public string FaultType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Fault percentage.
+        /// </summary>
+        public double? FaultPercentage { get; set; }
    }
 }
--- a/src/WireMock.Net.Abstractions/Admin/Scenarios/ScenarioStateModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Scenarios/ScenarioStateModel.cs
--- a/src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs
@@ -24,5 +24,10 @@
        /// Gets or sets the MaxRequestLog count.
        /// </summary>
        public int? MaxRequestLogCount { get; set; }
+
+        /// <summary>
+        /// Gets or sets wether to allow a body for all HTTP methods.
+        /// </summary>
+        public bool? AllowBodyForAllHttpMethods { get; set; }
    }
 }
--- a/src/WireMock.Net.Abstractions/Handlers/IFileSystemHandler.cs
+++ b/src/WireMock.Net.Abstractions/Handlers/IFileSystemHandler.cs
@@ -31,8 +31,9 @@ namespace WireMock.Handlers
        ///  Returns an enumerable collection of file names in a specified path.
        /// </summary>
        /// <param name="path">The path.</param>
-        /// <returns>An enumerable collection of the full names (including paths) for the files in the directory specified by path.</returns>
-        IEnumerable<string> EnumerateFiles([NotNull] string path);
+        /// <param name="includeSubdirectories">A value indicating whether subdirectories should also included when enumerating files.</param>
+        /// <returns>An enumerable collection of the full names (including paths) for the files in the directory (and optionally subdirectories) specified by path.</returns>
+        IEnumerable<string> EnumerateFiles([NotNull] string path, bool includeSubdirectories);

        /// <summary>
        /// Read a static mapping file as text.
--- a/src/WireMock.Net.Abstractions/Logging/IWireMockLogger.cs
+++ b/src/WireMock.Net.Abstractions/Logging/IWireMockLogger.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System;
+using JetBrains.Annotations;
 using WireMock.Admin.Requests;

 namespace WireMock.Logging
@@ -45,6 +46,15 @@ namespace WireMock.Logging
        [StringFormatMethod("formatString")]
        void Error([NotNull] string formatString, [NotNull] params object[] args);

+        /// <summary>
+        /// Writes the message at the Error level using the specified exception. 
+        /// </summary>
+        /// <param name="formatString">The format string.</param>
+        /// <param name="exception">The exception.</param>
+        [PublicAPI]
+        [StringFormatMethod("formatString")]
+        void Error([NotNull] string formatString, [NotNull] Exception exception);
+
        /// <summary>
        /// Writes the LogEntryModel (LogRequestModel, LogResponseModel and more).
        /// </summary>
--- a/src/WireMock.Net.Abstractions/Types/BodyType.cs
+++ b/src/WireMock.Net.Abstractions/Types/BodyType.cs
@@ -1,4 +1,4 @@
-namespace WireMock.Util
+namespace WireMock.Types
 {
    /// <summary>
    /// The BodyType
--- a/src/WireMock.Net.Abstractions/Types/WireMockList.cs
+++ b/src/WireMock.Net.Abstractions/Types/WireMockList.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;

-namespace WireMock.Util
+namespace WireMock.Types
 {
    /// <summary>
    /// A special List which overrides the ToString() to return first value.
--- a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
+++ b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
@@ -0,0 +1,46 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Commonly used interfaces, models, enumerations and types.</Description>
+    <AssemblyTitle>WireMock.Net.Abstractions</AssemblyTitle>
+    <Authors>Stef Heyenrath</Authors>
+    <TargetFrameworks>netstandard1.0;netstandard2.0;net45</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>WireMock.Net.Abstractions</AssemblyName>
+    <PackageId>WireMock.Net.Abstractions</PackageId>
+    <PackageTags>wiremock;interfaces;models;classes;enumerations;types</PackageTags>
+    <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
+    <PackageIconUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/WireMock.Net-Logo.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+    <RootNamespace>WireMock</RootNamespace>
+    <!--<DebugType>full</DebugType>
+    <IncludeSource>True</IncludeSource>
+    <IncludeSymbols>True</IncludeSymbols>-->
+    <ProjectGuid>{B6269AAC-170A-4346-8B9A-579DED3D9A94}</ProjectGuid>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+    <!--<DelaySign>true</DelaySign>-->
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
+    <!--<GeneratePackageOnBuild>true</GeneratePackageOnBuild>-->
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
--- a/src/WireMock.Net/Client/IFluentMockServerAdmin.cs
+++ b/src/WireMock.Net/Client/IFluentMockServerAdmin.cs
@@ -5,6 +5,7 @@ using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Requests;
+using WireMock.Admin.Scenarios;
 using WireMock.Admin.Settings;

 namespace WireMock.Client
@@ -12,7 +13,8 @@ namespace WireMock.Client
    /// <summary>
    /// The RestEase interface which defines all admin commands.
    /// </summary>
-    public interface IFluentMockServerAdmin
+    [BasePath("__admin")]
+    public interface IWireMockAdminApi
    {
        /// <summary>
        /// Authentication header
@@ -24,14 +26,14 @@ namespace WireMock.Client
        /// Get the settings.
        /// </summary>
        /// <returns>SettingsModel</returns>
-        [Get("__admin/settings")]
+        [Get("settings")]
        Task<SettingsModel> GetSettingsAsync();

        /// <summary>
        /// Update the settings.
        /// </summary>
        /// <param name="settings">SettingsModel</param>
-        [Put("__admin/settings")]
+        [Put("settings")]
        [Header("Content-Type", "application/json")]
        Task<StatusModel> PutSettingsAsync([Body] SettingsModel settings);

@@ -39,7 +41,7 @@ namespace WireMock.Client
        /// Update the settings
        /// </summary>
        /// <param name="settings">SettingsModel</param>
-        [Post("__admin/settings")]
+        [Post("settings")]
        [Header("Content-Type", "application/json")]
        Task<StatusModel> PostSettingsAsync([Body] SettingsModel settings);

@@ -47,14 +49,14 @@ namespace WireMock.Client
        /// Get the mappings.
        /// </summary>
        /// <returns>MappingModels</returns>
-        [Get("__admin/mappings")]
+        [Get("mappings")]
        Task<IList<MappingModel>> GetMappingsAsync();

        /// <summary>
        /// Add a new mapping.
        /// </summary>
        /// <param name="mapping">MappingModel</param>
-        [Post("__admin/mappings")]
+        [Post("mappings")]
        [Header("Content-Type", "application/json")]
        Task<StatusModel> PostMappingAsync([Body] MappingModel mapping);

@@ -62,28 +64,37 @@ namespace WireMock.Client
        /// Add new mappings.
        /// </summary>
        /// <param name="mappings">MappingModels</param>
-        [Post("__admin/mappings")]
+        [Post("mappings")]
        [Header("Content-Type", "application/json")]
        Task<StatusModel> PostMappingsAsync([Body] IList<MappingModel> mappings);

        /// <summary>
        /// Delete all mappings.
        /// </summary>
-        [Delete("__admin/mappings")]
+        [Delete("mappings")]
        Task<StatusModel> DeleteMappingsAsync();

+        /// <summary>
+        /// Delete mappings according to GUIDs
+        /// </summary>
+        /// <param name="mappings">MappingModels</param>
+        [Delete("mappings")]
+        [Header("Content-Type", "application/json")]
+        Task<StatusModel> DeleteMappingsAsync([Body] IList<MappingModel> mappings);
+
        /// <summary>
        /// Delete (reset) all mappings.
        /// </summary>
+        /// <param name="reloadStaticMappings">A value indicating whether to reload the static mappings after the reset.</param>
        [Post("__admin/mappings/reset")]
-        Task<StatusModel> ResetMappingsAsync();
+        Task<StatusModel> ResetMappingsAsync(bool? reloadStaticMappings = false);

        /// <summary>
        /// Get a mapping based on the guid
        /// </summary>
        /// <param name="guid">The Guid</param>
        /// <returns>MappingModel</returns>
-        [Get("__admin/mappings/{guid}")]
+        [Get("mappings/{guid}")]
        Task<MappingModel> GetMappingAsync([Path] Guid guid);

        /// <summary>
@@ -91,7 +102,7 @@ namespace WireMock.Client
        /// </summary>
        /// <param name="guid">The Guid</param>
        /// <param name="mapping">MappingModel</param>
-        [Put("__admin/mappings/{guid}")]
+        [Put("mappings/{guid}")]
        [Header("Content-Type", "application/json")]
        Task<StatusModel> PutMappingAsync([Path] Guid guid, [Body] MappingModel mapping);

@@ -99,32 +110,32 @@ namespace WireMock.Client
        /// Delete a mapping based on the guid
        /// </summary>
        /// <param name="guid">The Guid</param>
-        [Delete("__admin/mappings/{guid}")]
+        [Delete("mappings/{guid}")]
        Task<StatusModel> DeleteMappingAsync([Path] Guid guid);

        /// <summary>
        /// Save the mappings
        /// </summary>
-        [Post("__admin/mappings/save")]
+        [Post("mappings/save")]
        Task<StatusModel> SaveMappingAsync();

        /// <summary>
        /// Get the requests.
        /// </summary>
        /// <returns>LogRequestModels</returns>
-        [Get("__admin/requests")]
+        [Get("requests")]
        Task<IList<LogEntryModel>> GetRequestsAsync();

        /// <summary>
        /// Delete all requests.
        /// </summary>
-        [Delete("__admin/requests")]
+        [Delete("requests")]
        Task<StatusModel> DeleteRequestsAsync();

        /// <summary>
        /// Delete (reset) all requests.
        /// </summary>
-        [Post("__admin/requests/reset")]
+        [Post("requests/reset")]
        Task<StatusModel> ResetRequestsAsync();

        /// <summary>
@@ -132,40 +143,40 @@ namespace WireMock.Client
        /// </summary>
        /// <param name="guid">The Guid</param>
        /// <returns>MappingModel</returns>
-        [Get("__admin/requests/{guid}")]
+        [Get("requests/{guid}")]
        Task<LogEntryModel> GetRequestAsync([Path] Guid guid);

        /// <summary>
        /// Delete a request based on the guid
        /// </summary>
        /// <param name="guid">The Guid</param>
-        [Delete("__admin/requests/{guid}")]
+        [Delete("requests/{guid}")]
        Task<StatusModel> DeleteRequestAsync([Path] Guid guid);

        /// <summary>
        /// Find a request based on the criteria
        /// </summary>
        /// <param name="model">The RequestModel</param>
-        [Post("__admin/requests/find")]
+        [Post("requests/find")]
        [Header("Content-Type", "application/json")]
        Task<IList<LogEntryModel>> FindRequestsAsync([Body] RequestModel model);

        /// <summary>
        /// Get all scenarios
        /// </summary>
-        [Get("__admin/scenarios")]
-        Task<IList<ScenarioState>> GetScenariosAsync();
+        [Get("scenarios")]
+        Task<IList<ScenarioStateModel>> GetScenariosAsync();

        /// <summary>
        /// Delete (reset) all scenarios
        /// </summary>
-        [Delete("__admin/scenarios")]
+        [Delete("scenarios")]
        Task<StatusModel> DeleteScenariosAsync();

        /// <summary>
        /// Delete (reset) all scenarios
        /// </summary>
-        [Post("__admin/scenarios")]
+        [Post("scenarios")]
        Task<StatusModel> ResetScenariosAsync();

        /// <summary>
@@ -173,7 +184,7 @@ namespace WireMock.Client
        /// </summary>
        /// <param name="filename">The filename</param>
        /// <param name="body">The body</param>
-        [Post("__admin/files/{filename}")]
+        [Post("files/{filename}")]
        Task<StatusModel> PostFileAsync([Path] string filename, [Body] string body);

        /// <summary>
@@ -181,28 +192,28 @@ namespace WireMock.Client
        /// </summary>
        /// <param name="filename">The filename</param>
        /// <param name="body">The body</param>
-        [Put("__admin/files/{filename}")]
+        [Put("files/{filename}")]
        Task<StatusModel> PutFileAsync([Path] string filename, [Body] string body);

        /// <summary>
        /// Get the content of an existing File
        /// </summary>
        /// <param name="filename">The filename</param>
-        [Get("__admin/files/{filename}")]
+        [Get("files/{filename}")]
        Task<string> GetFileAsync([Path] string filename);

        /// <summary>
        /// Delete an existing File
        /// </summary>
        /// <param name="filename">The filename</param>
-        [Delete("__admin/files/{filename}")]
+        [Delete("files/{filename}")]
        Task<StatusModel> DeleteFileAsync([Path] string filename);

        /// <summary>
        /// Check if a file exists
        /// </summary>
        /// <param name="filename">The filename</param>
-        [Head("__admin/files/{filename}")]
+        [Head("files/{filename}")]
        Task FileExistsAsync([Path] string filename);
    }
 }
--- a/src/WireMock.Net.RestClient/WireMock.Net.RestClient.csproj
+++ b/src/WireMock.Net.RestClient/WireMock.Net.RestClient.csproj
@@ -0,0 +1,48 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>A RestClient using RestEase to access the admin interface.</Description>
+    <AssemblyTitle>WireMock.Net.RestClient</AssemblyTitle>
+    <Authors>Stef Heyenrath</Authors>
+    <TargetFrameworks>netstandard1.1;netstandard2.0;net45</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>WireMock.Net.RestClient</AssemblyName>
+    <PackageId>WireMock.Net.RestClient</PackageId>
+    <PackageTags>wiremock;rest;client;restclient;restease;rest;json</PackageTags>
+    <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
+    <PackageIconUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/WireMock.Net-Logo.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+    <RootNamespace>WireMock.Client</RootNamespace>
+    <!--<DebugType>full</DebugType>
+    <IncludeSource>True</IncludeSource>
+    <IncludeSymbols>True</IncludeSymbols>-->
+    <ProjectGuid>{B6269AAC-170A-43D6-8B9A-579DED3D9A96}</ProjectGuid>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+    <!--<DelaySign>true</DelaySign>-->
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="RestEase" Version="1.4.10" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/src/WireMock.Net.StandAlone/StandAloneApp.cs
+++ b/src/WireMock.Net.StandAlone/StandAloneApp.cs
@@ -1,9 +1,9 @@
-using System.Linq;
+using JetBrains.Annotations;
+using System.Linq;
+using WireMock.Logging;
 using WireMock.Server;
 using WireMock.Settings;
 using WireMock.Validation;
-using JetBrains.Annotations;
-using WireMock.Logging;

 namespace WireMock.Net.StandAlone
 {
@@ -17,13 +17,13 @@ namespace WireMock.Net.StandAlone
        /// </summary>
        /// <param name="settings">The FluentMockServerSettings</param>
        [PublicAPI]
-        public static FluentMockServer Start([NotNull] IFluentMockServerSettings settings)
+        public static WireMockServer Start([NotNull] IWireMockServerSettings settings)
        {
            Check.NotNull(settings, nameof(settings));

-            var server = FluentMockServer.Start(settings);
+            var server = WireMockServer.Start(settings);

-            settings.Logger.Info("WireMock.Net server listening at {0}", string.Join(",", server.Urls));
+            settings.Logger?.Info("WireMock.Net server listening at {0}", string.Join(",", server.Urls));

            return server;
        }
@@ -34,59 +34,13 @@ namespace WireMock.Net.StandAlone
        /// <param name="args">The commandline arguments</param>
        /// <param name="logger">The logger</param>
        [PublicAPI]
-        public static FluentMockServer Start([NotNull] string[] args, [CanBeNull] IWireMockLogger logger = null)
+        public static WireMockServer Start([NotNull] string[] args, [CanBeNull] IWireMockLogger logger = null)
        {
            Check.NotNull(args, nameof(args));

-            var parser = new SimpleCommandLineParser();
-            parser.Parse(args);
+            var settings = WireMockServerSettingsParser.ParseArguments(args, logger);

-            var settings = new FluentMockServerSettings
-            {
-                StartAdminInterface = parser.GetBoolValue("StartAdminInterface", true),
-                ReadStaticMappings = parser.GetBoolValue("ReadStaticMappings"),
-                WatchStaticMappings = parser.GetBoolValue("WatchStaticMappings"),
-                AllowPartialMapping = parser.GetBoolValue("AllowPartialMapping", false),
-                AdminUsername = parser.GetStringValue("AdminUsername"),
-                AdminPassword = parser.GetStringValue("AdminPassword"),
-                MaxRequestLogCount = parser.GetIntValue("MaxRequestLogCount"),
-                RequestLogExpirationDuration = parser.GetIntValue("RequestLogExpirationDuration")
-            };
-
-            if (logger != null)
-            {
-                settings.Logger = logger;
-            }
-
-            if (parser.GetStringValue("WireMockLogger") == "WireMockConsoleLogger")
-            {
-                settings.Logger = new WireMockConsoleLogger();
-            }
-
-            if (parser.Contains("Port"))
-            {
-                settings.Port = parser.GetIntValue("Port");
-            }
-            else
-            {
-                settings.Urls = parser.GetValues("Urls", new[] { "http://*:9091/" });
-            }
-
-            string proxyURL = parser.GetStringValue("ProxyURL");
-            if (!string.IsNullOrEmpty(proxyURL))
-            {
-                settings.ProxyAndRecordSettings = new ProxyAndRecordSettings
-                {
-                    Url = proxyURL,
-                    SaveMapping = parser.GetBoolValue("SaveMapping"),
-                    SaveMappingToFile = parser.GetBoolValue("SaveMappingToFile"),
-                    ClientX509Certificate2ThumbprintOrSubjectName = parser.GetStringValue("ClientX509Certificate2ThumbprintOrSubjectName"),
-                    BlackListedHeaders = parser.GetValues("BlackListedHeaders"),
-                    BlackListedCookies = parser.GetValues("BlackListedCookies")
-                };
-            }
-
-            settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+            settings.Logger?.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));

            return Start(settings);
        }
--- a/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj
+++ b/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj
@@ -1,60 +1,60 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
-    <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
-    <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net451;net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>WireMock.Net.StandAlone</AssemblyName>
-    <PackageId>WireMock.Net.StandAlone</PackageId>
-    <PackageTags>tdd;mock;http;wiremock;test;server;unittest</PackageTags>
-    <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
-    <PackageIconUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/WireMock.Net-Logo.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/LICENSE</PackageLicenseUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
-    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
-    <RootNamespace>WireMock.Net.StandAlone</RootNamespace>
-    <DebugType>full</DebugType>
-    <IncludeSource>True</IncludeSource>
-    <IncludeSymbols>True</IncludeSymbols>
-    <ProjectGuid>{B6269AAC-170A-43D5-8B9A-579DED3D9A95}</ProjectGuid>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <CodeAnalysisRuleSet>WireMock.Net.StandAlone.ruleset</CodeAnalysisRuleSet>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
-    <!--<DelaySign>true</DelaySign>-->
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
-    <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2018.2.1">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="7.8.0.7320">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\WireMock.Net\WireMock.Net.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
+    <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
+    <Authors>Stef Heyenrath</Authors>
+    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>WireMock.Net.StandAlone</AssemblyName>
+    <PackageId>WireMock.Net.StandAlone</PackageId>
+    <PackageTags>tdd;mock;http;wiremock;test;server;unittest</PackageTags>
+    <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
+    <PackageIconUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/WireMock.Net-Logo.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+    <RootNamespace>WireMock.Net.StandAlone</RootNamespace>
+    <!--<DebugType>full</DebugType>
+    <IncludeSource>True</IncludeSource>
+    <IncludeSymbols>True</IncludeSymbols>-->
+    <ProjectGuid>{B6269AAC-170A-43D5-8B9A-579DED3D9A95}</ProjectGuid>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <CodeAnalysisRuleSet>WireMock.Net.StandAlone.ruleset</CodeAnalysisRuleSet>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+    <!--<DelaySign>true</DelaySign>-->
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' ">
+    <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
+    <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="2018.2.1">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="7.8.0.7320">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>
 </Project>
--- a/src/WireMock.Net/Compatibility/WebProxy.cs
+++ b/src/WireMock.Net/Compatibility/WebProxy.cs
@@ -0,0 +1,28 @@
+#if NETSTANDARD1_3
+using System;
+using System.Net;
+
+namespace System.Net
+{
+    internal class WebProxy : IWebProxy
+    {
+        private readonly string _proxy;
+        public ICredentials Credentials { get; set; }
+
+        public WebProxy(string proxy)
+        {
+            _proxy = proxy;
+        }
+
+        public Uri GetProxy(Uri destination)
+        {
+            return new Uri(_proxy);
+        }
+
+        public bool IsBypassed(Uri host)
+        {
+            return true;
+        }
+    }
+}
+#endif
--- a/src/WireMock.Net/Handlers/LocalFileSystemHandler.cs
+++ b/src/WireMock.Net/Handlers/LocalFileSystemHandler.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
+using WireMock.Util;
 using WireMock.Validation;

 namespace WireMock.Handlers
@@ -46,11 +47,11 @@ namespace WireMock.Handlers
        }

        /// <inheritdoc cref="IFileSystemHandler.EnumerateFiles"/>
-        public IEnumerable<string> EnumerateFiles(string path)
+        public IEnumerable<string> EnumerateFiles(string path, bool includeSubdirectories)
        {
            Check.NotNullOrEmpty(path, nameof(path));

-            return Directory.EnumerateFiles(path);
+            return includeSubdirectories ? Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories) : Directory.EnumerateFiles(path);
        }

        /// <inheritdoc cref="IFileSystemHandler.GetMappingFolder"/>
@@ -80,20 +81,20 @@ namespace WireMock.Handlers
        public byte[] ReadResponseBodyAsFile(string path)
        {
            Check.NotNullOrEmpty(path, nameof(path));
-
-            // In case the path is a filename, the path will be adjusted to the MappingFolder.
+            path = PathUtils.CleanPath(path);
+            // If the file exists at the given path relative to the MappingsFolder, then return that.
            // Else the path will just be as-is.
-            return File.ReadAllBytes(Path.GetFileName(path) == path ? Path.Combine(GetMappingFolder(), path) : path);
+            return File.ReadAllBytes(File.Exists(PathUtils.Combine(GetMappingFolder(), path)) ? PathUtils.Combine(GetMappingFolder(), path) : path);
        }

        /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsString"/>
        public string ReadResponseBodyAsString(string path)
        {
            Check.NotNullOrEmpty(path, nameof(path));
-
+            path = PathUtils.CleanPath(path);
            // In case the path is a filename, the path will be adjusted to the MappingFolder.
            // Else the path will just be as-is.
-            return File.ReadAllText(Path.GetFileName(path) == path ? Path.Combine(GetMappingFolder(), path) : path);
+            return File.ReadAllText(File.Exists(PathUtils.Combine(GetMappingFolder(), path)) ? PathUtils.Combine(GetMappingFolder(), path) : path);
        }

        /// <inheritdoc cref="IFileSystemHandler.FileExists"/>
--- a/src/WireMock.Net/Http/HttpClientHelper.cs
+++ b/src/WireMock.Net/Http/HttpClientHelper.cs
@@ -1,16 +1,17 @@
-using System;
+using JetBrains.Annotations;
+using System;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
 using WireMock.HttpsCertificate;
+using WireMock.Settings;
 using WireMock.Validation;

 namespace WireMock.Http
 {
    internal static class HttpClientHelper
    {
-        public static HttpClient CreateHttpClient(string clientX509Certificate2ThumbprintOrSubjectName = null)
+        public static HttpClient CreateHttpClient(IProxyAndRecordSettings settings)
        {
 #if NETSTANDARD
            var handler = new HttpClientHandler
@@ -36,20 +37,30 @@ namespace WireMock.Http
            ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11;
 #endif

-            if (!string.IsNullOrEmpty(clientX509Certificate2ThumbprintOrSubjectName))
+            if (!string.IsNullOrEmpty(settings.ClientX509Certificate2ThumbprintOrSubjectName))
            {
                handler.ClientCertificateOptions = ClientCertificateOption.Manual;

-                var x509Certificate2 = ClientCertificateHelper.GetCertificate(clientX509Certificate2ThumbprintOrSubjectName);
+                var x509Certificate2 = ClientCertificateHelper.GetCertificate(settings.ClientX509Certificate2ThumbprintOrSubjectName);
                handler.ClientCertificates.Add(x509Certificate2);
            }

-            // For proxy we shouldn't follow auto redirects
-            handler.AllowAutoRedirect = false;
+            handler.AllowAutoRedirect = settings.AllowAutoRedirect == true;

            // If UseCookies enabled, httpClient ignores Cookie header
            handler.UseCookies = false;

+            if (settings.WebProxySettings != null)
+            {
+                handler.UseProxy = true;
+
+                handler.Proxy = new WebProxy(settings.WebProxySettings.Address);
+                if (settings.WebProxySettings.UserName != null && settings.WebProxySettings.Password != null)
+                {
+                    handler.Proxy.Credentials = new NetworkCredential(settings.WebProxySettings.UserName, settings.WebProxySettings.Password);
+                }
+            }
+
            var client = new HttpClient(handler);
 #if NET452 || NET46
            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
@@ -57,7 +68,7 @@ namespace WireMock.Http
            return client;
        }

-        public static async Task<ResponseMessage> SendAsync([NotNull] HttpClient client, [NotNull] RequestMessage requestMessage, string url)
+        public static async Task<ResponseMessage> SendAsync([NotNull] HttpClient client, [NotNull] RequestMessage requestMessage, string url, bool deserializeJson)
        {
            Check.NotNull(client, nameof(client));
            Check.NotNull(requestMessage, nameof(requestMessage));
@@ -72,7 +83,7 @@ namespace WireMock.Http
            var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead);

            // Create ResponseMessage
-            return await HttpResponseMessageHelper.Create(httpResponseMessage, requiredUri, originalUri);
+            return await HttpResponseMessageHelper.CreateAsync(httpResponseMessage, requiredUri, originalUri, deserializeJson);
        }
    }
 }
--- a/src/WireMock.Net/Http/HttpRequestMessageHelper.cs
+++ b/src/WireMock.Net/Http/HttpRequestMessageHelper.cs
@@ -1,11 +1,11 @@
-using System;
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
-using JetBrains.Annotations;
-using MimeKit;
-using Newtonsoft.Json;
-using WireMock.Util;
+using System.Net.Http.Headers;
+using WireMock.Types;
 using WireMock.Validation;

 namespace WireMock.Http
@@ -19,11 +19,11 @@ namespace WireMock.Http

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

-            ContentType contentType = null;
+            MediaTypeHeaderValue contentType = null;
            if (requestMessage.Headers != null && requestMessage.Headers.ContainsKey(HttpKnownHeaderNames.ContentType))
            {
                var value = requestMessage.Headers[HttpKnownHeaderNames.ContentType].FirstOrDefault();
-                ContentType.TryParse(value, out contentType);
+                MediaTypeHeaderValue.TryParse(value, out contentType);
            }

            switch (requestMessage.BodyData?.DetectedBodyType)
--- a/src/WireMock.Net/Http/HttpRequestMethods.cs
+++ b/src/WireMock.Net/Http/HttpRequestMethods.cs
@@ -0,0 +1,18 @@
+namespace WireMock.Http
+{
+    /// <summary>
+    /// https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods
+    /// </summary>
+    internal static class HttpRequestMethods
+    {
+        public const string CONNECT = "CONNECT";
+        public const string DELETE = "DELETE";
+        public const string GET = "GET";
+        public const string HEAD = "HEAD";
+        public const string OPTIONS = "OPTIONS";
+        public const string PATCH = "PATCH";
+        public const string POST = "POST";
+        public const string PUT = "PUT";
+        public const string TRACE = "TRACE";
+    }
+}
--- a/src/WireMock.Net/Http/HttpResponseMessageHelper.cs
+++ b/src/WireMock.Net/Http/HttpResponseMessageHelper.cs
@@ -9,7 +9,7 @@ namespace WireMock.Http
 {
    internal static class HttpResponseMessageHelper
    {
-        public static async Task<ResponseMessage> Create(HttpResponseMessage httpResponseMessage, Uri requiredUri, Uri originalUri)
+        public static async Task<ResponseMessage> CreateAsync(HttpResponseMessage httpResponseMessage, Uri requiredUri, Uri originalUri, bool deserializeJson)
        {
            var responseMessage = new ResponseMessage { StatusCode = (int)httpResponseMessage.StatusCode };

@@ -24,7 +24,7 @@ namespace WireMock.Http
                    contentTypeHeader = headers.First(header => string.Equals(header.Key, HttpKnownHeaderNames.ContentType, StringComparison.OrdinalIgnoreCase)).Value;
                }

-                responseMessage.BodyData = await BodyParser.Parse(stream, contentTypeHeader?.FirstOrDefault());
+                responseMessage.BodyData = await BodyParser.Parse(stream, contentTypeHeader?.FirstOrDefault(), deserializeJson);
            }

            foreach (var header in headers)
--- a/src/WireMock.Net/Http/StringContentHelper.cs
+++ b/src/WireMock.Net/Http/StringContentHelper.cs
@@ -1,8 +1,6 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Text;
 using JetBrains.Annotations;
-using MimeKit;
 using WireMock.Validation;

 namespace WireMock.Http
@@ -10,29 +8,18 @@ namespace WireMock.Http
    internal static class StringContentHelper
    {
        /// <summary>
-        /// Creates a StringContent object. Note that the Encoding is only set when it's also set on the original header.
+        /// Creates a StringContent object.
        /// </summary>
        /// <param name="content">The string content (cannot be null)</param>
        /// <param name="contentType">The ContentType (can be null)</param>
        /// <returns>StringContent</returns>
-        internal static StringContent Create([NotNull] string content, [CanBeNull] ContentType contentType)
+        internal static StringContent Create([NotNull] string content, [CanBeNull] MediaTypeHeaderValue contentType)
        {
            Check.NotNull(content, nameof(content));

-            if (contentType == null)
-            {
-                return new StringContent(content);
-            }
-
-            if (contentType.Charset == null)
-            {
-                var stringContent = new StringContent(content);
-                stringContent.Headers.ContentType = new MediaTypeHeaderValue(contentType.MimeType);
-                return stringContent;
-            }
-
-            var encoding = Encoding.GetEncoding(contentType.Charset);
-            return new StringContent(content, encoding, contentType.MimeType);
+            var stringContent = new StringContent(content);
+            stringContent.Headers.ContentType = contentType;
+            return stringContent;
        }
    }
 }
--- a/src/WireMock.Net/HttpsCertificate/PublicCertificateHelper.cs
+++ b/src/WireMock.Net/HttpsCertificate/PublicCertificateHelper.cs
@@ -3,6 +3,9 @@ using System.Security.Cryptography.X509Certificates;

 namespace WireMock.HttpsCertificate
 {
+    /// <summary>
+    /// Only used for NetStandard 1.3
+    /// </summary>
    internal static class PublicCertificateHelper
    {
        // 1] Generate using https://www.pluralsight.com/blog/software-development/selfcert-create-a-self-signed-certificate-interactively-gui-or-programmatically-in-net
--- a/src/WireMock.Net/IMapping.cs
+++ b/src/WireMock.Net/IMapping.cs
@@ -62,9 +62,9 @@ namespace WireMock
        IResponseProvider Provider { get; }

        /// <summary>
-        /// The FluentMockServerSettings.
+        /// The WireMockServerSettings.
        /// </summary>
-        IFluentMockServerSettings Settings { get; }
+        IWireMockServerSettings Settings { get; }

        /// <summary>
        /// Is State started ?
@@ -78,6 +78,14 @@ namespace WireMock
        /// <c>true</c> if this mapping is an Admin Interface; otherwise, <c>false</c>.
        /// </value>
        bool IsAdminInterface { get; }
+        
+        /// <summary>
+        /// Gets a value indicating whether this mapping to be logged.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if this mapping to be logged; otherwise, <c>false</c>.
+        /// </value>
+        bool LogMapping { get; }

        /// <summary>
        /// ProvideResponseAsync
--- a/src/WireMock.Net/Logging/WireMockConsoleLogger.cs
+++ b/src/WireMock.Net/Logging/WireMockConsoleLogger.cs
@@ -1,5 +1,5 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
+using System;
 using WireMock.Admin.Requests;

 namespace WireMock.Logging
@@ -36,12 +36,27 @@ namespace WireMock.Logging
            Console.WriteLine(Format("Warn", formatString, args));
        }

-        /// <see cref="IWireMockLogger.Error"/>
+        /// <see cref="IWireMockLogger.Error(string, object[])"/>
        public void Error(string formatString, params object[] args)
        {
            Console.WriteLine(Format("Error", formatString, args));
        }

+        /// <see cref="IWireMockLogger.Error(string, Exception)"/>
+        public void Error(string formatString, Exception exception)
+        {
+            Console.WriteLine(Format("Error", formatString, exception.Message));
+
+            if (exception is AggregateException ae)
+            {
+                ae.Handle(ex =>
+                {
+                    Console.WriteLine(Format("Error", "Exception {0}", exception.Message));
+                    return true;
+                });
+            }
+        }
+
        /// <see cref="IWireMockLogger.DebugRequestResponse"/>
        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
        {
--- a/src/WireMock.Net/Logging/WireMockNullLogger.cs
+++ b/src/WireMock.Net/Logging/WireMockNullLogger.cs
@@ -1,4 +1,5 @@
-using WireMock.Admin.Requests;
+using System;
+using WireMock.Admin.Requests;

 namespace WireMock.Logging
 {
@@ -26,12 +27,18 @@ namespace WireMock.Logging
            // Log nothing
        }

-        /// <see cref="IWireMockLogger.Error"/>
+        /// <see cref="IWireMockLogger.Error(string, object[])"/>
        public void Error(string formatString, params object[] args)
        {
            // Log nothing
        }

+        /// <see cref="IWireMockLogger.Error(string, Exception)"/>
+        public void Error(string formatString, Exception exception)
+        {
+            // Log nothing
+        }
+
        /// <see cref="IWireMockLogger.DebugRequestResponse"/>
        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
        {
--- a/src/WireMock.Net/Mapping.cs
+++ b/src/WireMock.Net/Mapping.cs
@@ -1,6 +1,6 @@
-using JetBrains.Annotations;
-using System;
+using System;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using WireMock.Matchers.Request;
 using WireMock.ResponseProviders;
 using WireMock.Settings;
@@ -40,7 +40,7 @@ namespace WireMock
        public IResponseProvider Provider { get; }

        /// <inheritdoc cref="IMapping.Settings" />
-        public IFluentMockServerSettings Settings { get; }
+        public IWireMockServerSettings Settings { get; }

        /// <inheritdoc cref="IMapping.IsStartState" />
        public bool IsStartState => Scenario == null || Scenario != null && NextState != null && ExecutionConditionState == null;
@@ -48,13 +48,16 @@ namespace WireMock
        /// <inheritdoc cref="IMapping.IsAdminInterface" />
        public bool IsAdminInterface => Provider is DynamicResponseProvider || Provider is DynamicAsyncResponseProvider || Provider is ProxyAsyncResponseProvider;

+        /// <inheritdoc cref="IMapping.LogMapping" />
+        public bool LogMapping => !(Provider is DynamicResponseProvider || Provider is DynamicAsyncResponseProvider);
+
        /// <summary>
        /// Initializes a new instance of the <see cref="Mapping"/> class.
        /// </summary>
        /// <param name="guid">The unique identifier.</param>
        /// <param name="title">The unique title (can be null).</param>
        /// <param name="path">The full file path from this mapping title (can be null).</param>
-        /// <param name="settings">The FluentMockServerSettings.</param>
+        /// <param name="settings">The WireMockServerSettings.</param>
        /// <param name="requestMatcher">The request matcher.</param>
        /// <param name="provider">The provider.</param>
        /// <param name="priority">The priority for this mapping.</param>
@@ -62,7 +65,7 @@ namespace WireMock
        /// <param name="executionConditionState">State in which the current mapping can occur. [Optional]</param>
        /// <param name="nextState">The next state which will occur after the current mapping execution. [Optional]</param>
        public Mapping(Guid guid, [CanBeNull] string title, [CanBeNull] string path,
-            [NotNull] IFluentMockServerSettings settings, [NotNull] IRequestMatcher requestMatcher, [NotNull] IResponseProvider provider,
+            [NotNull] IWireMockServerSettings settings, [NotNull] IRequestMatcher requestMatcher, [NotNull] IResponseProvider provider,
            int priority, [CanBeNull] string scenario, [CanBeNull] string executionConditionState, [CanBeNull] string nextState)
        {
            Guid = guid;
--- a/src/WireMock.Net/Matchers/CSharpCodeMatcher.cs
+++ b/src/WireMock.Net/Matchers/CSharpCodeMatcher.cs
@@ -0,0 +1,197 @@
+using System;
+using System.Linq;
+using JetBrains.Annotations;
+using Newtonsoft.Json.Linq;
+using WireMock.Exceptions;
+using WireMock.Validation;
+
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// CSharpCode / CS-Script Matcher
+    /// </summary>
+    /// <inheritdoc cref="IObjectMatcher"/>
+    /// <inheritdoc cref="IStringMatcher"/>
+    internal class CSharpCodeMatcher : IObjectMatcher, IStringMatcher
+    {
+        private const string TemplateForIsMatchWithString = "{0} public class CodeHelper {{ public bool IsMatch(string it) {{ {1} }} }}";
+
+        private const string TemplateForIsMatchWithDynamic = "{0} public class CodeHelper {{ public bool IsMatch(dynamic it) {{ {1} }} }}";
+
+        private readonly string[] _usings =
+        {
+            "System",
+            "System.Linq",
+            "System.Collections.Generic",
+            "Microsoft.CSharp",
+            "Newtonsoft.Json.Linq"
+        };
+
+        public MatchBehaviour MatchBehaviour { get; }
+
+        private readonly string[] _patterns;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CSharpCodeMatcher"/> class.
+        /// </summary>
+        /// <param name="patterns">The patterns.</param>
+        public CSharpCodeMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, patterns)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CSharpCodeMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="patterns">The patterns.</param>
+        public CSharpCodeMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] patterns)
+        {
+            Check.NotNull(patterns, nameof(patterns));
+
+            MatchBehaviour = matchBehaviour;
+            _patterns = patterns;
+        }
+
+        public double IsMatch(string input)
+        {
+            return IsMatchInternal(input);
+        }
+
+        public double IsMatch(object input)
+        {
+            return IsMatchInternal(input);
+        }
+
+        public double IsMatchInternal(object input)
+        {
+            double match = MatchScores.Mismatch;
+
+            if (input != null)
+            {
+                match = MatchScores.ToScore(_patterns.Select(pattern => IsMatch(input, pattern)));
+            }
+
+            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
+        }
+
+        private bool IsMatch(dynamic input, string pattern)
+        {
+            bool isMatchWithString = input is string;
+            var inputValue = isMatchWithString ? input : JObject.FromObject(input);
+            string source = GetSourceForIsMatchWithString(pattern, isMatchWithString);
+
+            object result = null;
+
+#if NET451 || NET452
+            var compilerParams = new System.CodeDom.Compiler.CompilerParameters
+            {
+                GenerateInMemory = true,
+                GenerateExecutable = false,
+                ReferencedAssemblies =
+                {
+                    "System.dll",
+                    "System.Core.dll",
+                    "Microsoft.CSharp.dll",
+                    "Newtonsoft.Json.dll"
+                }
+            };
+
+            using (var codeProvider = new Microsoft.CSharp.CSharpCodeProvider())
+            {
+                var compilerResults = codeProvider.CompileAssemblyFromSource(compilerParams, source);
+
+                if (compilerResults.Errors.Count != 0)
+                {
+                    var errors = from System.CodeDom.Compiler.CompilerError er in compilerResults.Errors select er.ToString();
+                    throw new WireMockException(string.Join(", ", errors));
+                }
+
+                object helper = compilerResults.CompiledAssembly.CreateInstance("CodeHelper");
+                if (helper == null)
+                {
+                    throw new WireMockException("CSharpCodeMatcher: Unable to create instance from WireMock.CodeHelper");
+                }
+
+                var methodInfo = helper.GetType().GetMethod("IsMatch");
+                if (methodInfo == null)
+                {
+                    throw new WireMockException("CSharpCodeMatcher: Unable to find method 'IsMatch' in WireMock.CodeHelper");
+                }
+
+                try
+                {
+                    result = methodInfo.Invoke(helper, new[] { inputValue });
+                }
+                catch
+                {
+                    throw new WireMockException("CSharpCodeMatcher: Unable to call method 'IsMatch' in WireMock.CodeHelper");
+                }
+            }
+#elif NET46 || NET461
+            dynamic script;
+            try
+            {
+                script = CSScriptLibrary.CSScript.Evaluator.CompileCode(source).CreateObject("*");
+            }
+            catch
+            {
+                throw new WireMockException("CSharpCodeMatcher: Unable to create compiler for WireMock.CodeHelper");
+            }
+            
+            try
+            {
+                result = script.IsMatch(inputValue);
+            }
+            catch
+            {
+                throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper");
+            }
+#elif NETSTANDARD2_0
+            dynamic script;
+            try
+            {
+                var assembly = CSScriptLib.CSScript.Evaluator.CompileCode(source);
+                script = csscript.GenericExtensions.CreateObject(assembly, "*");
+            }
+            catch (Exception ex)
+            {
+                throw new WireMockException("CSharpCodeMatcher: Unable to compile code for WireMock.CodeHelper", ex);
+            }
+
+            try
+            {
+                result = script.IsMatch(inputValue);
+            }
+            catch (Exception ex)
+            {
+                throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper");
+            }
+#else
+            throw new NotSupportedException("The 'CSharpCodeMatcher' cannot be used in netstandard 1.3");
+#endif
+            try
+            {
+                return (bool)result;
+            }
+            catch
+            {
+                throw new WireMockException($"Unable to cast result '{result}' to bool");
+            }
+        }
+
+        private string GetSourceForIsMatchWithString(string pattern, bool isMatchWithString)
+        {
+            string template = isMatchWithString ? TemplateForIsMatchWithString : TemplateForIsMatchWithDynamic;
+            return string.Format(template, string.Join(Environment.NewLine, _usings.Select(u => $"using {u};")), pattern);
+        }
+
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
+        public string[] GetPatterns()
+        {
+            return _patterns;
+        }
+
+        /// <inheritdoc cref="IMatcher.Name"/>
+        public string Name => "CSharpCodeMatcher";
+    }
+}
--- a/src/WireMock.Net/Matchers/ContentTypeMatcher.cs
+++ b/src/WireMock.Net/Matchers/ContentTypeMatcher.cs
@@ -0,0 +1,73 @@
+using System.Net.Http.Headers;
+using JetBrains.Annotations;
+
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// ContentTypeMatcher which accepts also all charsets
+    /// </summary>
+    /// <seealso cref="RegexMatcher" />
+    public class ContentTypeMatcher : WildcardMatcher
+    {
+        private readonly string[] _patterns;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
+        /// </summary>
+        /// <param name="pattern">The pattern.</param>
+        /// <param name="ignoreCase">IgnoreCase (default false)</param>
+        public ContentTypeMatcher([NotNull] string pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="pattern">The pattern.</param>
+        /// <param name="ignoreCase">IgnoreCase (default false)</param>
+        public ContentTypeMatcher(MatchBehaviour matchBehaviour, [NotNull] string pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
+        /// </summary>
+        /// <param name="patterns">The patterns.</param>
+        /// <param name="ignoreCase">IgnoreCase (default false)</param>
+        public ContentTypeMatcher([NotNull] string[] patterns, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="patterns">The patterns.</param>
+        /// <param name="ignoreCase">IgnoreCase (default false)</param>
+        public ContentTypeMatcher(MatchBehaviour matchBehaviour, [NotNull] string[] patterns, bool ignoreCase = false) : base(matchBehaviour, patterns, ignoreCase)
+        {
+            _patterns = patterns;
+        }
+
+        /// <inheritdoc cref="RegexMatcher.IsMatch"/>
+        public override double IsMatch(string input)
+        {
+            if (string.IsNullOrEmpty(input) || !MediaTypeHeaderValue.TryParse(input, out MediaTypeHeaderValue contentType))
+            {
+                return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.Mismatch);
+            }
+
+            return base.IsMatch(contentType.MediaType);
+        }
+
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
+        public override string[] GetPatterns()
+        {
+            return _patterns;
+        }
+
+        /// <inheritdoc cref="IMatcher.Name"/>
+        public override string Name => "ContentTypeMatcher";
+    }
+}
--- a/src/WireMock.Net/Matchers/JSONPathMatcher.cs
+++ b/src/WireMock.Net/Matchers/JSONPathMatcher.cs
@@ -93,10 +93,7 @@ namespace WireMock.Matchers

        private double IsMatch(JToken jtoken)
        {
-            // Wrap in array if needed
-            JToken tokenOrArray = jtoken is JArray ? jtoken : new JArray(jtoken);
-
-            return MatchScores.ToScore(_patterns.Select(pattern => tokenOrArray.SelectToken(pattern) != null));
+            return MatchScores.ToScore(_patterns.Select(pattern => jtoken.SelectToken(pattern) != null));
        }
    }
 }
--- a/src/WireMock.Net/Matchers/JsonMatcher.cs
+++ b/src/WireMock.Net/Matchers/JsonMatcher.cs
@@ -1,6 +1,9 @@
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System.Collections;
+using System.Linq;
+using WireMock.Util;
 using WireMock.Validation;

 namespace WireMock.Matchers
@@ -8,7 +11,7 @@ namespace WireMock.Matchers
    /// <summary>
    /// JsonMatcher
    /// </summary>
-    public class JsonMatcher : IValueMatcher
+    public class JsonMatcher : IValueMatcher, IIgnoreCaseMatcher
    {
        /// <inheritdoc cref="IValueMatcher.Value"/>
        public object Value { get; }
@@ -19,11 +22,15 @@ namespace WireMock.Matchers
        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
        public MatchBehaviour MatchBehaviour { get; }

+        /// <inheritdoc cref="IIgnoreCaseMatcher.IgnoreCase"/>
+        public bool IgnoreCase { get; }
+
        /// <summary>
        /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
        /// </summary>
        /// <param name="value">The string value to check for equality.</param>
-        public JsonMatcher([NotNull] string value) : this(MatchBehaviour.AcceptOnMatch, value)
+        /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
+        public JsonMatcher([NotNull] string value, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase)
        {
        }

@@ -31,7 +38,8 @@ namespace WireMock.Matchers
        /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
        /// </summary>
        /// <param name="value">The object value to check for equality.</param>
-        public JsonMatcher([NotNull] object value) : this(MatchBehaviour.AcceptOnMatch, value)
+        /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
+        public JsonMatcher([NotNull] object value, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase)
        {
        }

@@ -40,12 +48,14 @@ namespace WireMock.Matchers
        /// </summary>
        /// <param name="matchBehaviour">The match behaviour.</param>
        /// <param name="value">The string value to check for equality.</param>
-        public JsonMatcher(MatchBehaviour matchBehaviour, [NotNull] string value)
+        /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
+        public JsonMatcher(MatchBehaviour matchBehaviour, [NotNull] string value, bool ignoreCase = false)
        {
            Check.NotNull(value, nameof(value));

            MatchBehaviour = matchBehaviour;
            Value = value;
+            IgnoreCase = ignoreCase;
        }

        /// <summary>
@@ -53,12 +63,14 @@ namespace WireMock.Matchers
        /// </summary>
        /// <param name="matchBehaviour">The match behaviour.</param>
        /// <param name="value">The object value to check for equality.</param>
-        public JsonMatcher(MatchBehaviour matchBehaviour, [NotNull] object value)
+        /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
+        public JsonMatcher(MatchBehaviour matchBehaviour, [NotNull] object value, bool ignoreCase = false)
        {
            Check.NotNull(value, nameof(value));

            MatchBehaviour = matchBehaviour;
            Value = value;
+            IgnoreCase = ignoreCase;
        }

        /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
@@ -74,7 +86,7 @@ namespace WireMock.Matchers
                    // Check if JToken or object
                    JToken jtokenInput = input is JToken tokenInput ? tokenInput : JObject.FromObject(input);

-                    // Check if JToken or string or object
+                    // Check if JToken, string, IEnumerable or object
                    JToken jtokenValue;
                    switch (Value)
                    {
@@ -83,7 +95,11 @@ namespace WireMock.Matchers
                            break;

                        case string stringValue:
-                            jtokenValue = JToken.Parse(stringValue);
+                            jtokenValue = JsonUtils.Parse(stringValue);
+                            break;
+
+                        case IEnumerable enumerableValue:
+                            jtokenValue = JArray.FromObject(enumerableValue);
                            break;

                        default:
@@ -91,7 +107,7 @@ namespace WireMock.Matchers
                            break;
                    }

-                    match = JToken.DeepEquals(jtokenValue, jtokenInput);
+                    match = DeepEquals(jtokenValue, jtokenInput);
                }
                catch (JsonException)
                {
@@ -101,5 +117,53 @@ namespace WireMock.Matchers

            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(match));
        }
+
+        private bool DeepEquals(JToken value, JToken input)
+        {
+            if (!IgnoreCase)
+            {
+                return JToken.DeepEquals(value, input);
+            }
+
+            JToken renamedValue = Rename(value);
+            JToken renamedInput = Rename(input);
+
+            return JToken.DeepEquals(renamedValue, renamedInput);
+        }
+
+        private static string ToUpper(string input)
+        {
+            return input?.ToUpperInvariant();
+        }
+
+        // https://stackoverflow.com/questions/11679804/json-net-rename-properties
+        private static JToken Rename(JToken json)
+        {
+            if (json is JProperty property)
+            {
+                JToken propertyValue = property.Value;
+                if (propertyValue.Type == JTokenType.String)
+                {
+                    string stringValue = propertyValue.Value<string>();
+                    propertyValue = ToUpper(stringValue);
+                }
+
+                return new JProperty(ToUpper(property.Name), Rename(propertyValue));
+            }
+
+            if (json is JArray array)
+            {
+                var renamedValues = array.Select(Rename);
+                return new JArray(renamedValues);
+            }
+
+            if (json is JObject obj)
+            {
+                var renamedProperties = obj.Properties().Select(Rename);
+                return new JObject(renamedProperties);
+            }
+
+            return json;
+        }
    }
 }
--- a/src/WireMock.Net/Matchers/LinqMatcher.cs
+++ b/src/WireMock.Net/Matchers/LinqMatcher.cs
@@ -9,8 +9,9 @@ namespace WireMock.Matchers
    /// <summary>
    /// System.Linq.Dynamic.Core Expression Matcher
    /// </summary>
+    /// <inheritdoc cref="IObjectMatcher"/>
    /// <inheritdoc cref="IStringMatcher"/>
-    public class LinqMatcher : IStringMatcher
+    public class LinqMatcher : IObjectMatcher, IStringMatcher
    {
        private readonly string[] _patterns;

@@ -117,7 +118,6 @@ namespace WireMock.Matchers
            }

            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
-
        }

        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
--- a/src/WireMock.Net/Matchers/RegexMatcher.cs
+++ b/src/WireMock.Net/Matchers/RegexMatcher.cs
@@ -61,7 +61,8 @@ namespace WireMock.Matchers
            IgnoreCase = ignoreCase;
            MatchBehaviour = matchBehaviour;

-            RegexOptions options = RegexOptions.Compiled;
+            RegexOptions options = RegexOptions.Compiled | RegexOptions.Multiline;
+
            if (ignoreCase)
            {
                options |= RegexOptions.IgnoreCase;
@@ -71,7 +72,7 @@ namespace WireMock.Matchers
        }

        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
-        public double IsMatch(string input)
+        public virtual double IsMatch(string input)
        {
            double match = MatchScores.Mismatch;
            if (input != null)
--- a/src/WireMock.Net/Matchers/Request/MatchDetail.cs
+++ b/src/WireMock.Net/Matchers/Request/MatchDetail.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace WireMock.Matchers.Request
+{
+    public class MatchDetail
+    {
+        public Type MatcherType { get; set; }
+
+        public double Score { get; set; }
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stef Heyenrath	aeb95b02d2	1.1.10	2020-03-05 18:23:16 +01:00
Stef Heyenrath	2dbb984a1e	wip (#435 )	2020-03-05 18:20:49 +01:00
Stef Heyenrath	88dd1b9aa4	Option to disable JSON deserialization (#434 ) * Option to disable JSON deserialization * Fix build errors, add test case * make new parameter optional * set default for contentType as well	2020-03-05 17:59:24 +01:00
Stef Heyenrath	87c4344d65	UsingOptions, UsingConnect and UsingTrace (#427 )	2020-03-05 17:56:24 +01:00
Stef Heyenrath	2851c820e0	1.1.9	2020-02-25 22:22:01 +01:00
Stef Heyenrath	13ab37dd3e	LinqMatcher (#431 )	2020-02-25 22:17:15 +01:00
Stef Heyenrath	f49046374a	1.1.8.0	2020-02-22 11:14:11 +01:00
Stef Heyenrath	69488ced5f	fixes for Cookie and Header Reject on Match (#423 )	2020-02-22 11:07:45 +01:00
Stef Heyenrath	e6bcd625f7	Don't return empty dictionary object for response headers in JSON mapping (#424 )	2020-02-22 11:07:04 +01:00
Stef Heyenrath	d1b42bf436	wip (#421 )	2020-02-15 08:30:08 +01:00
Stef Heyenrath	f4861d9bab	/needs-a-key	2020-02-14 16:34:52 +01:00
Noah Lerner	4c01ef4838	Support multi line wild card matching (#419 )	2020-02-13 20:05:56 +01:00
Stef Heyenrath	83866f5719	Example: RejectOnMatch	2020-02-11 08:55:06 +01:00
Stef Heyenrath	f72c3c33ef	1.1.7	2020-02-06 18:44:52 +01:00
Noah Lerner	32248b6585	Fix new Delete with body missing from IWireMockAdminApi interface (#413 ) * Fix new Delete with body missing from IWireMockAdminApi interface * Admin Delete with mappings in body (#409) * Add unit test for delete with body * change order of checks for readability. looks nicer. * Allow body in DELETE requests * Fix unit tests according to DELETE supporting body * Re-run CI * Fix DELETE with body unit test * Fix ElementAt index in mappings list * Fix DELETE with body unit test * Fix theory tag must be accompanied by some InlineData or Member * Fix didn't use correct checking syntax * Fix wrap entire unit test in if region	2020-02-05 19:11:44 +01:00
Stef Heyenrath	1df4502631	fix (#414 )	2020-02-05 19:09:57 +01:00
Noah Lerner	5e76a82a21	Improved relative path checking based on file existence (#411 ) * Improved relative path checking based on file existence If the file exists at the relative path, then use it. If not, then use the path as is. * Apply File.Exists logic to ReadResponseBodyAsString as well * Make path handling more robust since path is user defined * Unit tests for relative path feature * Replace all back and forward slashes with system dependent DirectorySeparatorChar * Attempt fix broken directory separator chars for Unix platforms * Revert wrapping GetMappingFolder with CleanPath * Move CleanPath logic to its own class * Remove whitespace * Remove more whitespace * Improve CleanPath method * Move PathUtils tests to separate class Add another test to ResponseWithBodyFromFileTests * Fix Response_ProvideResponse_WithBodyFromFile_InAdminMappingFolder * Debug Linux CI build * Debug Linux CI * print all files from admin mappings folder * Debug CleanPath * Fix removed leading directory separator char in Linux breaks file path Remove debugging statements * Move combine to PathUtils * PathUtils + PathUtilsTests * Remove replicated (3x) tests throughout ResponseWithBodyFromFileTests Co-authored-by: Stef Heyenrath <Stef.Heyenrath@gmail.com>	2020-02-02 13:49:34 +01:00
Stef Heyenrath	06ae9d72c3	1.1.6.0	2020-01-27 18:51:31 +01:00
Stef Heyenrath	307a89d324	AllowAnyHttpStatusCodeInResponse (#407 ) * . * , * PUBLISH_TESTRESULTS * fix logging * fix compile error * codefactor fix * Debug - Sonar + other things in csproj	2020-01-27 18:47:58 +01:00
Stef Heyenrath	6ae7fc1d75	<VersionPrefix>1.1.5</VersionPrefix>	2020-01-25 18:06:51 +01:00
Stef Heyenrath	29e86abe12	1.1.5.0	2020-01-25 17:58:44 +01:00
Stef Heyenrath	710fc8dcf6	Fixed StatusCode = null or < 0 (#406 ) * . * fix tests * responseModel.StatusCode is int statusCodeAsInt && statusCodeAsInt > 0 * < 0	2020-01-25 17:51:38 +01:00
Stef Heyenrath	dfbfa5fd35	1.1.4.0	2020-01-25 15:28:43 +01:00
Stef Heyenrath	69bbd76ca4	Log Exception (#405 )	2020-01-25 15:25:47 +01:00
Stef Heyenrath	bd0c5a83c9	WireMock.Net.Service	2020-01-25 13:54:09 +01:00
Stef Heyenrath	a08efe2f78	steps:	2020-01-25 12:39:36 +01:00
Stef Heyenrath	6e151098e5	azure-pipelines	2020-01-25 12:29:13 +01:00
Stef Heyenrath	43d481435c	1.1.3	2020-01-22 16:40:10 +01:00
Kashif Jamal Soofi	ea1be6641a	Fix for invalid cast exception (#403 )	2020-01-22 14:27:44 +01:00
Stef Heyenrath	93613885c1	1.1.2.0	2020-01-09 20:18:07 +01:00
Vitaliy Davydiak	caee5895eb	ResponseModel.StatusCode is deserialized as either string or long. (#399 )	2020-01-09 20:15:15 +01:00
Stef Heyenrath	101d755a00	1.1.1.0	2020-01-09 18:04:41 +01:00
Kashif Jamal Soofi	368fdd4c7d	Feature/xpath transformer (#398 ) * XPath transformer, added handlerbars helper to select nodes using xpath and setting the outerxml value in response * Added test to select attribute value and node text * Removed extra empty lines	2020-01-09 17:51:44 +01:00
Stef Heyenrath	3f802c3948	1.1.0.0	2019-12-27 16:13:36 +01:00
Stef Heyenrath	d971144426	WireMock.Net version 1.1.x (#363 ) * refactor * rename api * -preview-01 * logger * move * RandomDataGenerator.Net * . * ISettings * renames... * refactor CommandlineParser logic * remove standalone * Remove Interfaces * Update tests * WireMock.Net.StandAlone * . * fix * . * _settings * Admin * WireMock.Net.Abstractions * fix build * rename WireMockServer * fix compile errors	2019-12-27 16:01:13 +01:00
Stef Heyenrath	368f0e13ac	1.0.43.0	2019-12-26 14:02:19 +01:00
Stef Heyenrath	120a808104	StatusCode as string (#385 ) * StatusCode as string * fix tests * fix test * ReplaceSingleNode * <!--<DelaySign>true</DelaySign>--> * Array * add test * Response_ProvideResponse_Handlebars_WithBodyAsJson_ResultAsHandlebarsString * net461 * . * fix * target frame * BodyAsJson * Response_ProvideResponse_WithStatusCode * fix build * fix test	2019-12-26 13:57:35 +01:00
Stef Heyenrath	b5795713b1	1.0.42.0	2019-12-15 12:19:41 +01:00
Stef Heyenrath	a8c17ce311	#383 (#391 )	2019-12-14 21:37:04 +01:00
Stef Heyenrath	7678e8fb70	1.0.41.0	2019-12-14 12:19:55 +01:00
Stef Heyenrath	8ae0abb023	. (#392 )	2019-12-13 13:21:50 +01:00
Stef Heyenrath	b3c2af0c22	1.0.40.0 (changelog)	2019-12-09 17:32:47 +01:00
Stef Heyenrath	2dd30b4f14	1.0.40	2019-12-09 17:31:50 +01:00
Stef Heyenrath	45d8c0cc27	Fix QueryStringParser (#389 ) * Fix QueryStringParser * add extra test	2019-12-09 17:20:17 +01:00
Stef Heyenrath	178f2cf02f	1.0.39.0	2019-12-07 08:58:24 +01:00
Stef Heyenrath	1b326a54d6	Add WebProxySettings (use when proxying requests) (#370 ) * webproxy part 1 * fixed * Push to MyGet * WebProxy standalone * -n true * nuget --- "-n true" * AllowAutoRedirect * .	2019-12-07 08:52:04 +01:00
Stef Heyenrath	8bafd6a1ba	Transform body as file (#388 ) * . * fix	2019-12-06 06:52:08 +01:00
Stef Heyenrath	a47750c058	1.0.38	2019-11-30 08:54:10 +01:00
Stef Heyenrath	5bb10c3350	Use dotnet default development certificate for .NET Core 2.x (#381 )	2019-11-29 14:51:03 +01:00
Stef Heyenrath	3a221f51b1	set handlebars dependency for .net 4.5.1 to fixed value (#378 )	2019-11-25 18:56:01 +01:00
Noah Lerner	0ff23a3d15	Support int values for states and scenario naming (#376 ) * Support int values for states and scenario naming * fix remove added dependency	2019-11-21 12:01:20 +01:00
Stef Heyenrath	9b323ab388	example	2019-11-19 18:54:28 +01:00
Stef Heyenrath	9b3c750754	-n true	2019-11-08 17:39:46 +01:00
Stef Heyenrath	a5d6061c2d	1.0.37.0	2019-11-08 17:26:08 +01:00
Stef Heyenrath	395be3c583	WatchStaticMappingsInSubdirectories (#374 ) * WatchStaticMappingsInSubdirectories * 37 * IEnumerable<string> EnumerateFiles([NotNull] string path, bool includeSubdirectories); * reloadStaticMappings	2019-11-07 15:31:43 +01:00
Stef Heyenrath	ea6a8d3b73	Push to MyGet	2019-10-31 20:43:12 +01:00
Stef Heyenrath	4886ac6196	Push to MyGet	2019-10-31 20:34:23 +01:00
Stef Heyenrath	0ca63eef66	RUN_SONAR (#373 )	2019-10-31 07:15:23 +00:00
Stef Heyenrath	c72487a748	Add images	2019-10-31 07:23:41 +01:00
Stef Heyenrath	79db955611	SaveMappingForStatusCodePattern	2019-10-29 19:02:59 +01:00
Stef Heyenrath	395f48a2bf	1.0.36.0	2019-10-26 08:04:40 +02:00
Stef Heyenrath	596177d4e5	Add support for Faults (#360 ) * FaultType - wip * . * copy fault * tests * code-factor * more tests * fix tests * fixed * remove RANDOM_DATA_THEN_CLOSE	2019-10-26 06:01:25 +00:00
Stef Heyenrath	fc024678fa	Doesn't push symbols (even if present).	2019-10-25 17:56:21 +02:00
Stef Heyenrath	2e78a04f3d	1.0.35.0	2019-10-25 17:31:30 +02:00
Stef Heyenrath	f3d2452093	remove Obsolete (#368 )	2019-10-25 08:40:40 +00:00
Stef Heyenrath	92e693818a	<PackageLicenseExpression>MIT</PackageLicenseExpression>	2019-10-22 21:24:22 +02:00
Stef Heyenrath	9a1ae6a3f0	Do not build symbol NuGets anymore. (#367 )	2019-10-22 19:19:53 +00:00
Stef Heyenrath	e701566a1f	1.0.34.0	2019-10-22 21:09:48 +02:00
Stef Heyenrath	84ad5a927e	2.x.x (#366 )	2019-10-22 18:58:36 +00:00
Stef Heyenrath	3250604b5a	#352 (#354 )	2019-10-22 18:53:30 +00:00
dependabot[bot]	9d2963632e	Bump Microsoft.AspNetCore.All in /examples/WireMock.Net.WebApplication (#365 ) Bumps [Microsoft.AspNetCore.All](https://github.com/aspnet/Universe) from 2.0.8 to 2.0.9. - [Release notes](https://github.com/aspnet/Universe/releases) - [Changelog](https://github.com/aspnet/Universe/blob/master/docs/CrossRepoBreakingChanges.md) - [Commits](https://github.com/aspnet/Universe/compare/2.0.8...2.0.9) Signed-off-by: dependabot[bot] <support@github.com>	2019-10-22 09:32:37 +00:00
Stef Heyenrath	9e0536c54c	1.0.33.0 - changelog	2019-10-12 08:58:55 +02:00
Stef Heyenrath	676e973011	1.0.33	2019-10-12 08:56:29 +02:00
Stef Heyenrath	31f3d77b38	Mark some classes and methods obsolete for version 1.1.0 (#335 ) * Obsolete * StandAloneApp - obsolete * obs * make Interface obsolete	2019-10-12 08:54:01 +02:00
Stef Heyenrath	4a2d512f83	Add Proxy Setting for: SaveMappingForStatusCodePattern to only save the mapping when the status code matches the pattern (#357 ) * proxy * HttpStatusRangeParserTests * test	2019-10-10 08:18:58 +02:00
Stef Heyenrath	87534c35f5	fix jsonpath matcher (#311 )	2019-10-09 13:08:02 +02:00
Stef Heyenrath	7789f94737	Fix JsonMatcher (parsing DateTimeOffset) (#358 ) * . * JObject Parse * JsonUtils.Parse * fix code comments	2019-10-09 11:16:39 +02:00
Stef Heyenrath	b2167f85ae	public event NotifyCollectionChangedEventHandler LogEntriesChanged (#355 )	2019-10-08 09:50:59 +02:00
Stef Heyenrath	3cc361e216	Fixed failing admin requests when content type includes a charset (based on idea from Paul Roub) (#353 ) * . * #350 * fix * .	2019-10-05 17:20:10 +02:00
Stef Heyenrath	0a9214ef47	Add CSharpCodeMatcher (#324 ) * wip * fix * . * windows-2019 * <Target Name="CheckIfShouldKillVBCSCompiler" /> * <!--https://github.com/aspnet/RoslynCodeDomProvider/issues/51--> * AllowCSharpCodeMatcher * CSharpCodeMatcher : IObjectMatcher * TemplateForIsMatchWithDynamic * RequestMessageBodyMatcher_GetMatchingScore_BodyAsJson_CSharpCodeMatcher * fix * } * Better Exception Handling	2019-09-28 17:55:07 +02:00
Stef Heyenrath	4afef3695b	test utils	2019-09-28 10:55:24 +02:00
Stef Heyenrath	782b082949	Prerelease: ''	2019-09-21 11:34:00 +02:00
Stef Heyenrath	36325fe2c7	source	2019-09-21 11:27:49 +02:00
Stef Heyenrath	01171b9592	Fix Push to NuGet	2019-09-21 11:15:46 +02:00
Stef Heyenrath	d6f44b2202	Add NuGet push	2019-09-21 10:58:12 +02:00
Stef Heyenrath	a2b22d8b0c	1.0.32.0	2019-09-20 19:09:47 +02:00
Stef Heyenrath	666992ef24	When posting new mapping, use DateParseHandling.None (#348 ) * . * OfType + test * remove line	2019-09-20 13:44:19 +02:00
Stef Heyenrath	9cd16f726f	1.0.31.0	2019-09-19 18:03:15 +02:00
Vitaliy Davydiak	feea64b328	Fix recorded requests skipped by request logger (#346 ) * Fix recorded requests skipped request logger. - When proxy is enabled the recorded requests are mistaken (IMO) for admin requests and skipped * Add unit test * Use different solution * Introduce IsRecordedByProxy property on Mapping class * Cleanup empty lines * Refactored fix suggested way	2019-09-17 18:15:23 +02:00
Stef Heyenrath	e1798fbb8e	. (#339 )	2019-09-17 18:13:01 +02:00
Stef Heyenrath	5b8b588983	Fix CompareTo in RequestMatchResult (#345 ) * Fix CompareTo in RequestMatchResult #344 * fix test	2019-09-17 14:50:43 +02:00
andi0b	2f406029c9	Fix issues with Proxy mode and Binary Request Bodies (#334 ) * Add Test for Proxy with binary request * Fix binary parsing in BodyParser * Fix binary Matching in RequestMessageBodyMatcher * Improved Binary Matching in RequestMessageBodyMatcher * BodyParser: Add test for Content Autodetection * RequestMessageBodyMatcherTests: Make Code more pretty :) * BodyParserChanges: Revert white space changes * Fixed test for different behavior in request matching	2019-09-01 15:44:07 +00:00
Stef Heyenrath	8c9a51c46d	release notes	2019-09-01 09:52:38 +02:00
Stef Heyenrath	ebe3275079	1.0.30.0	2019-08-31 21:13:38 +02:00
Stef Heyenrath	c0a43ed204	remove MimeKitLite and use MediaTypeHeaderValue (#338 )	2019-08-31 19:01:44 +00:00
Stef Heyenrath	7941894543	.	2019-08-30 22:03:08 +02:00
Stef Heyenrath	ec0bfd7eed	1.0.29.0	2019-08-29 21:54:02 +02:00
Stef Heyenrath	d885de1276	HandlebarsRegistrationCallback example	2019-08-25 18:40:54 +02:00
Stef Heyenrath	ccb2c51a39	JsonMatcher support IgnoreCase (#333 ) * JsonMatcher - IgnoreCase - #332 * also rename property name * Remove example project	2019-08-23 19:49:15 +00:00
Stef Heyenrath	2e33bcc464	#327 (#328 )	2019-08-23 11:38:29 +00:00
Simar	fc64c5f925	Convert collection into a new list before enumerating (#331 )	2019-08-22 17:58:53 +00:00