diff --git a/StevenVolckaert.EnterpriseLibrary.sln b/StevenVolckaert.EnterpriseLibrary.sln
index 9559677..8d9694f 100644
--- a/StevenVolckaert.EnterpriseLibrary.sln
+++ b/StevenVolckaert.EnterpriseLibrary.sln
@@ -1,46 +1,45 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StevenVolckaert.Core", "src\StevenVolckaert.Core\StevenVolckaert.Core.xproj", "{3E5DE170-18C8-4B09-90A6-7D158A6C54C5}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{00269925-9ABB-475F-A63B-B57C55E26CD3}"
 	ProjectSection(SolutionItems) = preProject
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		appveyor.yml = appveyor.yml
-		global.json = global.json
 		LICENSE = LICENSE
 		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{887100A5-003F-4148-85D8-9D9C9E7E5125}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StevenVolckaert.Core.Tests", "test\StevenVolckaert.Core.Tests\StevenVolckaert.Core.Tests.xproj", "{A97F5579-7D70-4FD4-8D6B-DC12E4909AD2}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{54EC9438-05ED-4ACD-AEF6-B31B353069EA}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StevenVolckaert.Core", "src\StevenVolckaert.Core\StevenVolckaert.Core.csproj", "{9493EB60-BD91-426A-BDF1-4390456046E1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StevenVolckaert.Core.Tests", "test\StevenVolckaert.Core.Tests\StevenVolckaert.Core.Tests.csproj", "{B2222404-4375-458C-9F04-C5F1D279CBA6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3E5DE170-18C8-4B09-90A6-7D158A6C54C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E5DE170-18C8-4B09-90A6-7D158A6C54C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E5DE170-18C8-4B09-90A6-7D158A6C54C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3E5DE170-18C8-4B09-90A6-7D158A6C54C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A97F5579-7D70-4FD4-8D6B-DC12E4909AD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A97F5579-7D70-4FD4-8D6B-DC12E4909AD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A97F5579-7D70-4FD4-8D6B-DC12E4909AD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A97F5579-7D70-4FD4-8D6B-DC12E4909AD2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9493EB60-BD91-426A-BDF1-4390456046E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9493EB60-BD91-426A-BDF1-4390456046E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9493EB60-BD91-426A-BDF1-4390456046E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9493EB60-BD91-426A-BDF1-4390456046E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2222404-4375-458C-9F04-C5F1D279CBA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2222404-4375-458C-9F04-C5F1D279CBA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2222404-4375-458C-9F04-C5F1D279CBA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2222404-4375-458C-9F04-C5F1D279CBA6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{3E5DE170-18C8-4B09-90A6-7D158A6C54C5} = {54EC9438-05ED-4ACD-AEF6-B31B353069EA}
-		{A97F5579-7D70-4FD4-8D6B-DC12E4909AD2} = {887100A5-003F-4148-85D8-9D9C9E7E5125}
+		{9493EB60-BD91-426A-BDF1-4390456046E1} = {54EC9438-05ED-4ACD-AEF6-B31B353069EA}
+		{B2222404-4375-458C-9F04-C5F1D279CBA6} = {887100A5-003F-4148-85D8-9D9C9E7E5125}
 	EndGlobalSection
 EndGlobal
diff --git a/appveyor.yml b/appveyor.yml
index 26c76a1..0f25904 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.0.0-{build}
+version: 1.1.0-{build}
 build:
   verbosity: minimal
 configuration:
@@ -6,14 +6,15 @@ configuration:
 - Release
 platform: Any CPU
 environment:
+  image: Visual Studio 2017
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
 init:
-- ps: $Env:LABEL = "CI" + $Env:APPVEYOR_BUILD_NUMBER.PadLeft(5, "0")
+- ps: $Env:VERSION_SUFFIX = "CI" + $Env:APPVEYOR_BUILD_NUMBER.PadLeft(5, "0")
 before_build:
 - appveyor-retry dotnet restore -v Minimal
 build_script:
-- dotnet build "src\StevenVolckaert.Core" -c %CONFIGURATION% --no-dependencies --version-suffix %LABEL%
+- dotnet build "src\StevenVolckaert.Core" -c %CONFIGURATION% --version-suffix %VERSION_SUFFIX%
 test_script:
-- dotnet test "test\StevenVolckaert.Core.Tests" -c %CONFIGURATION%
+- dotnet test "test\StevenVolckaert.Core.Tests\StevenVolckaert.Core.Tests.csproj" -c %CONFIGURATION%
 cache:
 - '%USERPROFILE%\.nuget\packages'
diff --git a/global.json b/global.json
deleted file mode 100644
index 9a66d5e..0000000
--- a/global.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "projects": [ "src", "test" ]
-}
diff --git a/src/StevenVolckaert.Core/ICollectionExtensions.cs b/src/StevenVolckaert.Core/ICollectionExtensions.cs
index 6a804fd..b0ce69b 100644
--- a/src/StevenVolckaert.Core/ICollectionExtensions.cs
+++ b/src/StevenVolckaert.Core/ICollectionExtensions.cs
@@ -5,7 +5,8 @@
     using System.Linq;
 
     /// <summary>
-    ///     Provides extension methods for instances that implement the <see cref="ICollection{T}"/> interface.
+    ///     Provides extension methods for instances that implement the <see cref="ICollection{T}"/>
+    ///     interface.
     /// </summary>
     public static class ICollectionExtensions
     {
@@ -27,8 +28,40 @@ IEnumerable<TSource> sourceCollection
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            if (sourceCollection != null)
-                foreach (TSource value in sourceCollection)
+            source.AddRange(sourceCollection, isDistinct: false);
+        }
+
+        /// <summary>
+        ///     Adds the elements of the specified collection to the end of the <see cref="ICollection{T}"/>
+        ///     instance.
+        /// </summary>
+        /// <typeparam name="TSource">The type of elements of <paramref name="source"/>.</typeparam>
+        /// <param name="source">The target data collection.</param>
+        /// <param name="isDistinct">
+        ///     A value that indicates whether to skip adding elements from
+        ///     <paramref name="sourceCollection"/> that <paramref name="source"/> already contains,
+        ///     using the default equality comparer.
+        /// </param>
+        /// <param name="sourceCollection">
+        ///     The collection whose elements should be added to the <see cref="ICollection{T}"/> instance.
+        /// </param>
+        /// <exception cref="ArgumentNullException"><paramref name="source"/> is <c>null</c>.</exception>
+        public static void AddRange<TSource>(
+            this ICollection<TSource> source,
+            IEnumerable<TSource> sourceCollection,
+            bool isDistinct
+        )
+        {
+            if (source == null)
+                throw new ArgumentNullException(nameof(source));
+
+            if (sourceCollection == null)
+                return;
+
+            foreach (TSource value in sourceCollection)
+                if (isDistinct && source.Contains(value))
+                    continue;
+                else
                     source.Add(value);
         }
 
@@ -42,7 +75,10 @@ IEnumerable<TSource> sourceCollection
         /// <exception cref="ArgumentNullException">
         ///     <paramref name="source"/> or <paramref name="predicate"/> is <c>null</c>.
         /// </exception>
-        public static void RemoveFirst<TSource>(this ICollection<TSource> source, Func<TSource, bool> predicate)
+        public static void RemoveFirst<TSource>(
+            this ICollection<TSource> source,
+            Func<TSource, bool> predicate
+        )
         {
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
diff --git a/src/StevenVolckaert.Core/IDictionaryExtensions.cs b/src/StevenVolckaert.Core/IDictionaryExtensions.cs
index f78514f..da46fb9 100644
--- a/src/StevenVolckaert.Core/IDictionaryExtensions.cs
+++ b/src/StevenVolckaert.Core/IDictionaryExtensions.cs
@@ -7,8 +7,8 @@
 #endif
 
     /// <summary>
-    ///     Provides extension methods for instances that implement the <see cref="IDictionary{TKey, TValue}"/>
-    ///     interface.
+    ///     Provides extension methods for instances that implement the
+    ///     <see cref="IDictionary{TKey, TValue}"/> interface.
     /// </summary>
     public static class IDictionaryExtensions
     {
@@ -34,8 +34,8 @@ this IDictionary<TKey, TValue> dictionary
 #endif
 
         /// <summary>
-        ///     Gets the value associated with the specified key, or the type's default value if the key
-        ///     doesn't exist.
+        ///     Gets the value associated with the specified key,
+        ///     or the type's default value if the key doesn't exist.
         /// </summary>
         /// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
         /// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
@@ -55,11 +55,12 @@ public static TValue TryGetValue<TKey, TValue>(this IDictionary<TKey, TValue> di
             if (key == null)
                 throw new ArgumentNullException(nameof(key));
 
-            return dictionary.TryGetValue(key, defaultValue: default(TValue));
+            return dictionary.TryGetValue(key, fallbackValue: default(TValue));
         }
 
         /// <summary>
-        ///     Gets the value associated with the specified key, or a default value if the key doesn't exist.
+        ///     Gets the value associated with the specified key,
+        ///     or a specified fallback value if the key doesn't exist.
         /// </summary>
         /// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
         /// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
@@ -67,15 +68,15 @@ public static TValue TryGetValue<TKey, TValue>(this IDictionary<TKey, TValue> di
         ///     The <see cref="IDictionary{TKey, TValue}"/> instance this extension method affects.
         /// </param>
         /// <param name="key">The key whose value to get.</param>
-        /// <param name="defaultValue">The default value.</param>
+        /// <param name="fallbackValue">The default value.</param>
         /// <returns>
-        ///     The value associated with the specified key, or <paramref name="defaultValue"/> if
+        ///     The value associated with the specified key, or <paramref name="fallbackValue"/> if
         ///     <paramref name="key"/> doesn't exist.
         /// </returns>
         public static TValue TryGetValue<TKey, TValue>(
             this IDictionary<TKey, TValue> dictionary,
             TKey key,
-            TValue defaultValue
+            TValue fallbackValue
         )
         {
             if (dictionary == null)
@@ -84,7 +85,7 @@ TValue defaultValue
             if (key == null)
                 throw new ArgumentNullException(nameof(key));
 
-            return dictionary.ContainsKey(key) ? dictionary[key] : defaultValue;
+            return dictionary.ContainsKey(key) ? dictionary[key] : fallbackValue;
         }
     }
 }
diff --git a/src/StevenVolckaert.Core/IEnumerableExtensions.cs b/src/StevenVolckaert.Core/IEnumerableExtensions.cs
index 04e817c..31dfb48 100644
--- a/src/StevenVolckaert.Core/IEnumerableExtensions.cs
+++ b/src/StevenVolckaert.Core/IEnumerableExtensions.cs
@@ -8,17 +8,90 @@
 #endif
 
     /// <summary>
-    ///     Provides extension methods for instances that implement the <see cref="IEnumerable{T}"/> interface.
+    ///     Provides extension methods for instances that implement the <see cref="IEnumerable{T}"/>
+    ///     interface.
     /// </summary>
     public static class IEnumerableExtensions
     {
+        /// <summary>
+        ///     Adds a specified element to the end of the sequence.
+        /// </summary>
+        /// <typeparam name="T">The type of the elements of <paramref name="source"/>.</typeparam>
+        /// <param name="source">
+        ///     The <see cref="IEnumerable{T}"/> instance this extension method affects.
+        /// </param>
+        /// <param name="element">The element to add.</param>
+        /// <returns>
+        ///     An <see cref="IEnumerable{T}"/> instance containing all elements of <paramref name="source"/>,
+        ///     followed by <paramref name="element"/>.
+        /// </returns>
+        /// <exception cref="ArgumentNullException">
+        ///     <paramref name="source"/> is <c>null</c>.
+        /// </exception>
+        public static IEnumerable<T> Append<T>(this IEnumerable<T> source, T element)
+        {
+            if (source == null)
+                throw new ArgumentNullException(nameof(source));
+
+            foreach (var sourceElement in source)
+                yield return sourceElement;
+
+            yield return element;
+        }
+
+        /// <summary>
+        ///     Adds a specified element to the beginning of the sequence.
+        /// </summary>
+        /// <typeparam name="T">The type of the elements of <paramref name="source"/>.</typeparam>
+        /// <param name="source">
+        ///     The <see cref="IEnumerable{T}"/> instance this extenion method affects.
+        /// </param>
+        /// <param name="element">The element to add.</param>
+        /// <returns>
+        ///     An <see cref="IEnumerable{T}"/> instance containing <paramref name="element"/>,
+        ///     followed by all elements of <paramref name="source"/>.
+        /// </returns>
+        /// <exception cref="ArgumentNullException">
+        ///     <paramref name="source"/> is <c>null</c>.
+        /// </exception>
+        public static IEnumerable<T> Prepend<T>(this IEnumerable<T> source, T element)
+        {
+            if (source == null)
+                throw new ArgumentNullException(nameof(source));
+
+            yield return element;
+
+            foreach (var sourceElement in source)
+                yield return sourceElement;
+        }
+
+        /// <summary>
+        ///     Determines whether a sequence contains no elements.
+        /// </summary>
+        /// <typeparam name="TSource">The type of the elements of <paramref name="source"/>.</typeparam>
+        /// <param name="source">The <see cref="IEnumerable{T}"/> instance to check for emptiness. </param>
+        /// <returns>
+        ///     <c>true</c> if the source sequence contains no elements; otherwise, <c>false</c>.
+        /// </returns>
+        /// <exception cref="ArgumentNullException"><paramref name="source"/> is <c>null</c>.</exception>
+        public static bool IsEmpty<TSource>(this IEnumerable<TSource> source)
+        {
+            if (source == null)
+                throw new ArgumentNullException(nameof(source));
+
+            return !source.Any();
+        }
+
         /// <summary>
         ///     Determines whether a sequence contains no elements.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements of <paramref name="source"/>.</typeparam>
         /// <param name="source">The <see cref="IEnumerable{T}"/> instance to check for emptiness. </param>
-        /// <returns><c>true</c> if the source sequence contains no elements; otherwise, <c>false</c>.</returns>
+        /// <returns>
+        ///     <c>true</c> if the source sequence contains no elements; otherwise, <c>false</c>.
+        /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> is <c>null</c>.</exception>
+        [Obsolete("Use of this method is deprecated. Use IEnumerable<T>.IsEmpty<T>() instead.")]
         public static bool Empty<TSource>(this IEnumerable<TSource> source)
         {
             if (source == null)
@@ -253,8 +326,8 @@ public static IEnumerable<T> SkipLast<T>(this IEnumerable<T> source)
         /// <param name="source">The sequence to remove elements from.</param>
         /// <param name="count">The number of elements to remove.</param>
         /// <returns>
-        ///     An <see cref="IEnumerable{T}"/> instance that doesn't contain the specified number of elements at
-        ///     the end of the input sequence.
+        ///     An <see cref="IEnumerable{T}"/> instance that doesn't contain the specified number of elements
+        ///     at the end of the input sequence.
         /// </returns>
         /// <exception cref="ArgumentNullException">
         ///     <paramref name="source"/> is <c>null</c>.
@@ -285,7 +358,8 @@ public static IEnumerable<T> SkipLast<T>(this IEnumerable<T> source, int count)
         /// <typeparam name="TSource">The type of the elements of <paramref name="source"/>.</typeparam>
         /// <param name="source">The sequence to create an <see cref="ObservableCollection{T}"/> from.</param>
         /// <returns>
-        ///     An <see cref="ObservableCollection{T}"/> instance that contains elements from the input sequence.
+        ///     An <see cref="ObservableCollection{T}"/> instance that contains elements from the input
+        ///     sequence.
         /// </returns>
         /// <exception cref="ArgumentNullException">
         ///     <paramref name="source"/> is <c>null</c>.
diff --git a/src/StevenVolckaert.Core/Properties/AssemblyInfo.cs b/src/StevenVolckaert.Core/Properties/AssemblyInfo.cs
deleted file mode 100644
index 78bab0d..0000000
--- a/src/StevenVolckaert.Core/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Release")]
-#endif
-
-[assembly: AssemblyCompany("Steven Volckaert")]
-[assembly: AssemblyProduct("StevenVolckaert.Core")]
-[assembly: AssemblyTrademark("")]
-
-[assembly: ComVisible(false)]
-[assembly: Guid("3e5de170-18c8-4b09-90a6-7d158a6c54c5")]
diff --git a/src/StevenVolckaert.Core/StevenVolckaert.Core.csproj b/src/StevenVolckaert.Core/StevenVolckaert.Core.csproj
new file mode 100644
index 0000000..945dc9c
--- /dev/null
+++ b/src/StevenVolckaert.Core/StevenVolckaert.Core.csproj
@@ -0,0 +1,40 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>StevenVolckaert.Core</AssemblyName>
+    <AssemblyTitle>Steven Volckaert's Enterprise Library - Core</AssemblyTitle>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <VersionPrefix>1.0.1</VersionPrefix>
+    <VersionSuffix>alpha</VersionSuffix>
+    <Copyright>Copyright (c) 2016, 2017 Steven Volckaert</Copyright>
+    <Description>Steven Volckaert's Enterprise Library contains reusable software components designed to assist software developers with writing less and semantically more meaningful code.
+
+See https://github.com/stevenvolckaert/enterprise-library for more information.</Description>
+    <Authors>Steven Volckaert</Authors>
+    <TargetFrameworks>net452;netstandard1.5</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageId>StevenVolckaert.Core</PackageId>
+    <PackageProjectUrl>https://github.com/stevenvolckaert/enterprise-library</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/stevenvolckaert/enterprise-library/blob/master/LICENSE</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/stevenvolckaert/enterprise-library</RepositoryUrl>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.5' ">1.6.1</NetStandardImplicitPackageVersion>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <RootNamespace>StevenVolckaert</RootNamespace>
+    <AssemblyVersion>1.1.0.0</AssemblyVersion>
+    <FileVersion>1.1.0.0</FileVersion>
+    <Version>1.1.0</Version>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
+    <Reference Include="System" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/StevenVolckaert.Core/StevenVolckaert.Core.xproj b/src/StevenVolckaert.Core/StevenVolckaert.Core.xproj
deleted file mode 100644
index 6e51fd5..0000000
--- a/src/StevenVolckaert.Core/StevenVolckaert.Core.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>3e5de170-18c8-4b09-90a6-7d158a6c54c5</ProjectGuid>
-    <RootNamespace>StevenVolckaert</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/StevenVolckaert.Core/StringExtensions.cs b/src/StevenVolckaert.Core/StringExtensions.cs
index 8edda45..a36154d 100644
--- a/src/StevenVolckaert.Core/StringExtensions.cs
+++ b/src/StevenVolckaert.Core/StringExtensions.cs
@@ -57,9 +57,23 @@ public static bool IsNullOrWhiteSpace(this string value)
         /// <returns>
         ///     The string, or the default value if the string is <c>null</c> or empty.
         /// </returns>
+        [Obsolete("Use of this method is deprecated. Use string.FallbackIfNullOrEmpty(string) instead.")]
         public static string DefaultIfNullOrEmpty(this string value, string defaultValue)
         {
-            return string.IsNullOrEmpty(value) ? defaultValue : value;
+            return value.FallbackIfNullOrWhiteSpace(defaultValue);
+        }
+
+        /// <summary>
+        ///     Returns the string, or a specified fallback value if the string is <c>null</c> or empty.
+        /// </summary>
+        /// <param name="value">The <see cref="string"/> value this extension method affects.</param>
+        /// <param name="fallbackValue">The default value.</param>
+        /// <returns>
+        ///     The string, or <paramref name="fallbackValue"/> if the string is <c>null</c> or empty.
+        /// </returns>
+        public static string FallbackIfNullOrEmpty(this string value, string fallbackValue)
+        {
+            return string.IsNullOrEmpty(value) ? fallbackValue : value;
         }
 
         /// <summary>
@@ -70,9 +84,25 @@ public static string DefaultIfNullOrEmpty(this string value, string defaultValue
         /// <returns>
         ///     The string, or the default value if the string is <c>null</c>, empty, or white space.
         /// </returns>
+        [Obsolete("Use of this method is deprecated. Use string.FallbackIfNullOrWhiteSpace(string) instead.")]
         public static string DefaultIfNullOrWhiteSpace(this string value, string defaultValue)
         {
-            return value.IsNullOrWhiteSpace() ? defaultValue : value;
+            return value.FallbackIfNullOrWhiteSpace(defaultValue);
+        }
+
+        /// <summary>
+        ///     Returns the string,
+        ///     or a specified fallback value if the string is <c>null</c>, empty, or white space.
+        /// </summary>
+        /// <param name="value">The <see cref="string"/> value this extension method affects.</param>
+        /// <param name="fallbackValue">The default value.</param>
+        /// <returns>
+        ///     The string, or <paramref name="fallbackValue"/> if the string is <c>null</c>, empty,
+        ///     or white space.
+        /// </returns>
+        public static string FallbackIfNullOrWhiteSpace(this string value, string fallbackValue)
+        {
+            return value.IsNullOrWhiteSpace() ? fallbackValue : value;
         }
 
         /// <summary>
@@ -89,8 +119,7 @@ public static string FirstFromSplit(this string value, params string[] separator
             if (string.IsNullOrEmpty(value))
                 return null;
 
-            var values = value.Split(separators, StringSplitOptions.RemoveEmptyEntries).ToList();
-            return values.FirstOrDefault();
+            return value.Split(separators, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
         }
 
         /// <summary>
diff --git a/src/StevenVolckaert.Core/UnitConvert.cs b/src/StevenVolckaert.Core/UnitConvert.cs
index a067203..1bad77d 100644
--- a/src/StevenVolckaert.Core/UnitConvert.cs
+++ b/src/StevenVolckaert.Core/UnitConvert.cs
@@ -7,7 +7,21 @@
     /// </summary>
     public static class UnitConvert
     {
-        private const double FeetPerMeter = 3.280839895;
+        private const double MillimetersPerInch = 25.4;
+        private const double MillimetersPerFoot = MillimetersPerInch * 12;
+        private const double MillimetersPerYard = MillimetersPerFoot * 3;
+
+        /// <summary>
+        ///     The millimeters per DTP point. The DTP is defined as 1⁄72 of an international inch
+        ///     (exactly 25.4 mm).
+        /// </summary>
+        /// <remarks>
+        ///     See https://en.wikipedia.org/wiki/Point_(typography) for more information.
+        /// </remarks>
+        private const double MillimetersPerPoint = MillimetersPerInch / 72;
+
+        private const double MetersPerFoot = MillimetersPerFoot / 1000;
+        private const double MetersPerYard = MillimetersPerYard / 1000;
 
         /// <summary>
         ///     Converts a value in degrees Celsius (°C) to its equivalent in degrees Fahrenheit (°F).
@@ -52,43 +66,83 @@ public static int FromFahrenheitToCelsius(double value)
         }
 
         /// <summary>
-        ///     Converts a value in feet to its equivalent in meter.
+        ///     Converts a value in feet to its equivalent in meters.
+        /// </summary>
+        /// <param name="value">The value to convert.</param>
+        /// <returns>The value in meters.</returns>
+        public static double FromFeetToMeters(int value)
+        {
+            return FromFeetToMeters((double)value);
+        }
+
+        /// <summary>
+        ///     Converts a value in feet to its equivalent in meters.
         /// </summary>
         /// <param name="value">The value to convert.</param>
-        /// <returns>The value in meter.</returns>
-        public static double FromFeetToMeter(int value)
+        /// <returns>The value in meters.</returns>
+        public static double FromFeetToMeters(double value)
         {
-            return FromFeetToMeter((double)value);
+            return value * MetersPerFoot;
         }
 
         /// <summary>
-        ///     Converts a value in feet to its equivalent in meter.
+        ///     Converts a value in international inches to its equivalent in millimeters.
         /// </summary>
         /// <param name="value">The value to convert.</param>
-        /// <returns>The value in meter.</returns>
-        public static double FromFeetToMeter(double value)
+        /// <returns>The value in millimeters.</returns>
+        public static double FromInchesToMillimeters(double value)
         {
-            return value / FeetPerMeter;
+            return value * MillimetersPerInch;
         }
 
         /// <summary>
-        ///     Converts a value in meter to its equivalent in feet.
+        ///     Converts a value in meters to its equivalent in feet.
         /// </summary>
         /// <param name="value">The value to convert.</param>
         /// <returns>The value in feet.</returns>
-        public static double FromMeterToFeet(int value)
+        public static double FromMetersToFeet(int value)
         {
-            return FromMeterToFeet((double)value);
+            return FromMetersToFeet((double)value);
         }
 
         /// <summary>
-        ///     Converts a value in meter to its equivalent in feet.
+        ///     Converts a value in meters to its equivalent in feet.
         /// </summary>
         /// <param name="value">The value to convert.</param>
         /// <returns>The value in feet.</returns>
-        public static double FromMeterToFeet(double value)
+        public static double FromMetersToFeet(double value)
+        {
+            return value / MetersPerFoot;
+        }
+
+        /// <summary>
+        ///     Converts a value in millimeters to its equivalent in international inches.
+        /// </summary>
+        /// <param name="value">The value to convert.</param>
+        /// <returns>The value in international inches.</returns>
+        public static double FromMillimetersToInches(double value)
+        {
+            return value / MillimetersPerInch;
+        }
+
+        /// <summary>
+        ///     Converts a value in millimeters to its equivalent in DTPs (Desktop Publishing Points).
+        /// </summary>
+        /// <param name="value">The value to convert.</param>
+        /// <returns>The value in DTPs (Desktop Publishing Points).</returns>
+        public static double FromMillimetersToPoints(double value)
+        {
+            return value / MillimetersPerPoint;
+        }
+
+        /// <summary>
+        ///     Converts a value in DTPs (Desktop Publishing Points) to its equivalent in millimeters.
+        /// </summary>
+        /// <param name="value">The value to convert.</param>
+        /// <returns>The value in millimeters.</returns>
+        public static double FromPointsToMillimeters(double value)
         {
-            return value * FeetPerMeter;
+            return value * MillimetersPerPoint;
         }
     }
 }
diff --git a/src/StevenVolckaert.Core/project.json b/src/StevenVolckaert.Core/project.json
deleted file mode 100644
index 5bcd835..0000000
--- a/src/StevenVolckaert.Core/project.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "title": "Steven Volckaert's Enterprise Library - Core",
-  "copyright": "Copyright (c) 2016 Steven Volckaert",
-  "description": "Steven Volckaert's Enterprise Library contains reusable software components designed to assist software developers with writing less and semantically more meaningful code.\n\nSee https://github.com/stevenvolckaert/enterprise-library for more information.",
-  "language": "en-US",
-  "version": "1.0.0-*",
-  "authors": [ "Steven Volckaert" ],
-  "frameworks": {
-    "net35": {},
-    "net452": {},
-    "netstandard1.5": {
-      "dependencies": {
-        "NETStandard.Library": "1.6.1"
-      }
-    }
-  },
-  "buildOptions": {
-    "xmlDoc": true
-  },
-  "packOptions": {
-    "projectUrl": "https://github.com/stevenvolckaert/enterprise-library",
-    "repository": {
-      "type": "git",
-      "url": "https://github.com/stevenvolckaert/enterprise-library"
-    },
-    "licenseUrl": "https://github.com/stevenvolckaert/enterprise-library/blob/master/LICENSE",
-    "requireLicenseAcceptance": false
-  }
-}
diff --git a/test/StevenVolckaert.Core.Tests/ICollectionExtensionsTests.cs b/test/StevenVolckaert.Core.Tests/ICollectionExtensionsTests.cs
new file mode 100644
index 0000000..c0053ac
--- /dev/null
+++ b/test/StevenVolckaert.Core.Tests/ICollectionExtensionsTests.cs
@@ -0,0 +1,45 @@
+namespace StevenVolckaert.Tests
+{
+    using System.Collections.Generic;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+    [TestClass]
+    public class ICollectionExtensionsTests
+    {
+        [TestMethod]
+        public void AddRangeTest()
+        {
+            var source = new List<string> { "foo", "bar", "baz" };
+            var other = new List<string> { "bar", "foo", "qux" };
+            var expected = new List<string> { "foo", "bar", "baz", "bar", "foo", "qux" };
+
+            source.AddRange(other);
+
+            CollectionAssert.AreEqual(expected, source);
+        }
+            
+        [TestMethod]
+        public void AddRangeIndistinctTest()
+        {
+            var source = new List<string> { "foo", "bar", "baz" };
+            var other = new List<string> { "bar", "foo", "qux" };
+            var expected = new List<string> { "foo", "bar", "baz", "bar", "foo", "qux" };
+
+            source.AddRange(other, isDistinct: false);
+
+            CollectionAssert.AreEqual(expected, source);
+        }
+
+        [TestMethod]
+        public void AddRangeDistinctTest()
+        {
+            var source = new List<string> { "foo", "bar", "baz" };
+            var other = new List<string> { "bar", "foo", "qux" };
+            var expected = new List<string> { "foo", "bar", "baz", "qux" };
+
+            source.AddRange(other, isDistinct: true);
+
+            CollectionAssert.AreEqual(expected, source);
+        }
+    }
+}
diff --git a/test/StevenVolckaert.Core.Tests/IEnumerableExtensionsTests.cs b/test/StevenVolckaert.Core.Tests/IEnumerableExtensionsTests.cs
index 596aa04..671e4b0 100644
--- a/test/StevenVolckaert.Core.Tests/IEnumerableExtensionsTests.cs
+++ b/test/StevenVolckaert.Core.Tests/IEnumerableExtensionsTests.cs
@@ -1,12 +1,32 @@
 namespace StevenVolckaert.Tests
 {
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
     using System;
     using System.Linq;
-    using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     [TestClass]
     public class IEnumerableExtensionsTests
     {
+        [TestMethod]
+        public void AppendTest()
+        {
+            var source = new string[] { "foo", "bar" };
+            var expected = new string[] { "foo", "bar", "baz" };
+            var actual = source.Append("baz").ToArray();
+
+            CollectionAssert.AreEqual(expected, actual);
+        }
+
+        [TestMethod]
+        public void PrependTest()
+        {
+            var source = new string[] { "bar", "baz" };
+            var expected = new string[] { "foo", "bar", "baz" };
+            var actual = source.Prepend("foo").ToArray();
+
+            CollectionAssert.AreEqual(expected, actual);
+        }
+
         [TestMethod]
         public void ExceptTest()
         {
diff --git a/test/StevenVolckaert.Core.Tests/Properties/AssemblyInfo.cs b/test/StevenVolckaert.Core.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8a72bfd..0000000
--- a/test/StevenVolckaert.Core.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Release")]
-#endif
-
-[assembly: AssemblyCompany("Steven Volckaert")]
-[assembly: AssemblyProduct("StevenVolckaert.Core.Tests")]
-[assembly: AssemblyTrademark("")]
-
-[assembly: ComVisible(false)]
-[assembly: Guid("a97f5579-7d70-4fd4-8d6b-dc12e4909ad2")]
diff --git a/test/StevenVolckaert.Core.Tests/StevenVolckaert.Core.Tests.csproj b/test/StevenVolckaert.Core.Tests/StevenVolckaert.Core.Tests.csproj
new file mode 100644
index 0000000..ec8e296
--- /dev/null
+++ b/test/StevenVolckaert.Core.Tests/StevenVolckaert.Core.Tests.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <RootNamespace>StevenVolckaert.Tests</RootNamespace>
+    <Version>1.1.0</Version>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.1.13" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.1.13" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\StevenVolckaert.Core\StevenVolckaert.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/StevenVolckaert.Core.Tests/StevenVolckaert.Core.Tests.xproj b/test/StevenVolckaert.Core.Tests/StevenVolckaert.Core.Tests.xproj
deleted file mode 100644
index ec4bd4e..0000000
--- a/test/StevenVolckaert.Core.Tests/StevenVolckaert.Core.Tests.xproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>a97f5579-7d70-4fd4-8d6b-dc12e4909ad2</ProjectGuid>
-    <RootNamespace>StevenVolckaert.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/test/StevenVolckaert.Core.Tests/UnitConvertTests.cs b/test/StevenVolckaert.Core.Tests/UnitConvertTests.cs
index a9e3db9..8fbb1b7 100644
--- a/test/StevenVolckaert.Core.Tests/UnitConvertTests.cs
+++ b/test/StevenVolckaert.Core.Tests/UnitConvertTests.cs
@@ -8,50 +8,50 @@
     public class UnitConvertTests
     {
         /// <summary>
-        /// A list of tuples that links degrees Celsius to degrees Fahrenheit.
-        /// Source http://www.rapidtables.com/convert/temperature/celsius-to-fahrenheit.htm
+        ///     A list of tuples that links degrees Celsius to degrees Fahrenheit.
+        ///     Source http://www.rapidtables.com/convert/temperature/celsius-to-fahrenheit.htm
         /// </summary>
         private static readonly List<Tuple<int, int>> _temperatureTuples =
             new List<Tuple<int, int>>
             {
-                new Tuple<int, int>(-50, -58),
-                new Tuple<int, int>(-40, -40),
-                new Tuple<int, int>(-30, -22),
-                new Tuple<int, int>(-20, -4),
-                new Tuple<int, int>(-10, 14),
-                new Tuple<int, int>(-9, 16),
-                new Tuple<int, int>(-8, 18),
-                new Tuple<int, int>(-7, 19),
-                new Tuple<int, int>(-6, 21),
-                new Tuple<int, int>(-5, 23),
-                new Tuple<int, int>(-4, 25),
-                new Tuple<int, int>(-3, 27),
-                new Tuple<int, int>(-2, 28),
-                new Tuple<int, int>(-1, 30),
-                new Tuple<int, int>(0, 32),
-                new Tuple<int, int>(1, 34),
-                new Tuple<int, int>(2, 36),
-                new Tuple<int, int>(3, 37),
-                new Tuple<int, int>(4, 39),
-                new Tuple<int, int>(5, 41),
-                new Tuple<int, int>(6, 43),
-                new Tuple<int, int>(7, 45),
-                new Tuple<int, int>(8, 46),
-                new Tuple<int, int>(9, 48),
-                new Tuple<int, int>(10, 50),
-                new Tuple<int, int>(20, 68),
-                new Tuple<int, int>(21, 70),
-                new Tuple<int, int>(30, 86),
-                new Tuple<int, int>(37, 99),
-                new Tuple<int, int>(40, 104),
-                new Tuple<int, int>(50, 122),
-                new Tuple<int, int>(60, 140),
-                new Tuple<int, int>(70, 158),
-                new Tuple<int, int>(80, 176),
-                new Tuple<int, int>(90, 194),
-                new Tuple<int, int>(100, 212),
-                new Tuple<int, int>(200, 392),
-                new Tuple<int, int>(300, 572),
+                Tuple.Create(-50, -58),
+                Tuple.Create(-40, -40),
+                Tuple.Create(-30, -22),
+                Tuple.Create(-20, -4),
+                Tuple.Create(-10, 14),
+                Tuple.Create(-9, 16),
+                Tuple.Create(-8, 18),
+                Tuple.Create(-7, 19),
+                Tuple.Create(-6, 21),
+                Tuple.Create(-5, 23),
+                Tuple.Create(-4, 25),
+                Tuple.Create(-3, 27),
+                Tuple.Create(-2, 28),
+                Tuple.Create(-1, 30),
+                Tuple.Create(0, 32),
+                Tuple.Create(1, 34),
+                Tuple.Create(2, 36),
+                Tuple.Create(3, 37),
+                Tuple.Create(4, 39),
+                Tuple.Create(5, 41),
+                Tuple.Create(6, 43),
+                Tuple.Create(7, 45),
+                Tuple.Create(8, 46),
+                Tuple.Create(9, 48),
+                Tuple.Create(10, 50),
+                Tuple.Create(20, 68),
+                Tuple.Create(21, 70),
+                Tuple.Create(30, 86),
+                Tuple.Create(37, 99),
+                Tuple.Create(40, 104),
+                Tuple.Create(50, 122),
+                Tuple.Create(60, 140),
+                Tuple.Create(70, 158),
+                Tuple.Create(80, 176),
+                Tuple.Create(90, 194),
+                Tuple.Create(100, 212),
+                Tuple.Create(200, 392),
+                Tuple.Create(300, 572),
             };
 
         [TestMethod]
@@ -69,17 +69,5 @@ public void FromFahrenheitToCelsiusTest()
                 x => Assert.AreEqual(x.Item1, UnitConvert.FromFahrenheitToCelsius(x.Item2))
             );
         }
-
-        //[TestMethod]
-        public void FromFeetToMeterTest()
-        {
-            throw new NotImplementedException();
-        }
-
-        //[TestMethod]
-        public void FromMeterToFeetTest()
-        {
-            throw new NotImplementedException();
-        }
     }
 }
diff --git a/test/StevenVolckaert.Core.Tests/project.json b/test/StevenVolckaert.Core.Tests/project.json
deleted file mode 100644
index 4882276..0000000
--- a/test/StevenVolckaert.Core.Tests/project.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "title": "StevenVolckaert.Core.Tests",
-  "copyright": "Copyright (c) 2016 Steven Volckaert",
-  "description": "Unit test project for StevenVolckaert.Core.",
-  "language": "en-US",
-  "version": "1.0.0-*",
-  "authors": [ "Steven Volckaert" ],
-
-  "testRunner": "mstest",
-
-  "dependencies": {
-    "StevenVolckaert.Core": "0.1.1-*",
-    "dotnet-test-mstest": "1.1.2-preview",
-    "Microsoft.NETCore.App": {
-      "version": "1.0.1",
-      "type": "platform"
-    },
-    "MSTest.TestFramework": "1.0.7-preview"
-  },
-
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  }
-}