diff --git a/ChangeLog.md b/ChangeLog.md
new file mode 100644
index 0000000..47eb46a
--- /dev/null
+++ b/ChangeLog.md
@@ -0,0 +1,25 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
+
+
+## [6.1.0] - 2017-06-07
+### Fixed
+- The new .NET Standard packaging (in AppVeyor) was creating an incorrect Assembly name. :blush:
+
+## [6.0.0] - 2017-05-27
+### Changed
+- Supports .NET Standard 1.4! Woot!
+
+### Fixed
+- #27: Uri fails to compare/equals when Uri contains characters that get encoded.
+
+## [5.1.0] - 2017-02-06
+### Added
+- Support for `Headers` in `HttpMessageOptions`.
+
+
+## [1.0.0 -> 5.0.0] - 2014-08-07 -> 2017-02-06
+### Added
+- Inital and subsequent releases in supporting faking an `HttpClient` request/response.
\ No newline at end of file
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
deleted file mode 100644
index 5ef1eea..0000000
--- a/ReleaseNotes.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Release Notes
-
-### v5.1.0 (2017-02-06)
-**Features**
-- Added support for `Headers` in `HttpMessageOptions`.
-
-
-### v1.0.0 -> v5.0.0
-- Inital and subsequent releases in supporting faking an `HttpClient` request/response.
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index fa28034..31ff2c9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -35,7 +35,7 @@ build_script:
 
 test_script:
   - dotnet test %tests_project_file% -c %CONFIGURATION% -v normal --no-build
-  - dotnet pack %library_project_file% /p:Version=%APPVEYOR_BUILD_VERSION% --no-build
+  - dotnet pack %library_project_file% -c %CONFIGURATION% /p:Version=%APPVEYOR_BUILD_VERSION% --no-build
 
 artifacts:
   - path: '**\*.nupkg'
diff --git a/src/HttpClient.Helpers/FakeMessageHandler.cs b/src/HttpClient.Helpers/FakeMessageHandler.cs
index 94d546f..25f5c9d 100644
--- a/src/HttpClient.Helpers/FakeMessageHandler.cs
+++ b/src/HttpClient.Helpers/FakeMessageHandler.cs
@@ -39,12 +39,7 @@ public FakeHttpMessageHandler(IEnumerable<HttpMessageOptions> lotsOfOptions)
         /// <param name="exception">The exception that will occur.</param>
         public FakeHttpMessageHandler(HttpRequestException exception)
         {
-            if (exception == null)
-            {
-                throw new ArgumentNullException(nameof(exception));
-            }
-
-            _exception = exception;
+            _exception = exception ?? throw new ArgumentNullException(nameof(exception));
         }
 
         protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request,
diff --git a/src/HttpClient.Helpers/HttpClient.Helpers.csproj b/src/HttpClient.Helpers/HttpClient.Helpers.csproj
index 2f7b729..5d86638 100644
--- a/src/HttpClient.Helpers/HttpClient.Helpers.csproj
+++ b/src/HttpClient.Helpers/HttpClient.Helpers.csproj
@@ -15,6 +15,8 @@
     <PackageIconUrl>http://i.imgur.com/bR4Yf.jpg</PackageIconUrl>
     <RepositoryUrl>https://github.com/PureKrome/HttpClient.Helpers</RepositoryUrl>
     <PackageTags>httpclient worlddomination worldomination unicorn magicalunicorn magical-unicorn</PackageTags>
+    <RootNamespace>WorldDomination.Net.Http</RootNamespace>
+    <AssemblyName>WorldDomination.HttpClient.Helpers</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/HttpClient.Helpers/HttpClient.Helpers.nuspec b/src/HttpClient.Helpers/HttpClient.Helpers.nuspec
deleted file mode 100644
index ed76790..0000000
--- a/src/HttpClient.Helpers/HttpClient.Helpers.nuspec
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-    <metadata>
-        <id>WorldDomination.HttpClient.Helpers</id>
-        <version>$version$</version>
-        <title>HttpClient helpers for System.Net.Http.HttpClient</title>
-        <authors>Justin Adler</authors>
-        <owners>Justin Adler</owners>
-        <licenseUrl>https://raw.githubusercontent.com/PureKrome/HttpClient.Helpers/master/LICENSE</licenseUrl>
-        <projectUrl>https://github.com/PureKrome/HttpClient.Helpers</projectUrl>
-        <iconUrl>http://i.imgur.com/bR4Yf.jpg</iconUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Some simple System.Net.Http.HttpClient helpers to help with your unit tests or when you don't really want to call the endpoint.</description>
-        <summary>Some simple System.Net.Http.HttpClient helpers.</summary>
-        <copyright>2014</copyright>
-        <language>en-AU</language>
-        <tags>httpclient worlddomination worldomination unicorn magicalunicorn magical-unicorn</tags>
-        <dependencies>
-            <dependency id="Microsoft.Net.Http" version="2.2.29" />
-        </dependencies>
-        <releaseNotes>Added support for Headers in HttpMessageOptions.</releaseNotes>
-    </metadata>
-    <files>
-        <file src="bin\Release\WorldDomination.HttpClient.Helpers.dll" target="lib\net45\WorldDomination.HttpClient.Helpers.dll" />
-    </files>
-</package>
\ No newline at end of file
diff --git a/src/HttpClient.Helpers/HttpMessageOptions.cs b/src/HttpClient.Helpers/HttpMessageOptions.cs
index a4a2467..763ab02 100644
--- a/src/HttpClient.Helpers/HttpMessageOptions.cs
+++ b/src/HttpClient.Helpers/HttpMessageOptions.cs
@@ -8,7 +8,7 @@ namespace WorldDomination.Net.Http
 {
     public class HttpMessageOptions
     {
-        private const string _anyValue = "*";
+        private const string AnyValue = "*";
         private HttpContent _httpContent;
         private string _httpContentSerialized;
 
@@ -32,7 +32,7 @@ public class HttpMessageOptions
         /// </summary>
         public HttpContent HttpContent
         {
-            get { return _httpContent; }
+            get => _httpContent;
             set
             {
                 _httpContent = value;
@@ -50,11 +50,12 @@ public HttpContent HttpContent
         // Note: I'm using reflection to set the value in here because I want this value to be _read-only_.
         //       Secondly, this occurs during a UNIT TEST, so I consider the expensive reflection costs to be
         //       acceptable in this situation.
+        // ReSharper disable once UnusedAutoPropertyAccessor.Local
         public int NumberOfTimesCalled { get; private set; }
 
         public override string ToString()
         {
-            var httpMethodText = HttpMethod?.ToString() ?? _anyValue;
+            var httpMethodText = HttpMethod?.ToString() ?? AnyValue;
 
             var headers = Headers != null &&
                           Headers.Any()