diff --git a/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj b/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj
index 047451f26..a42a129ed 100644
--- a/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj
+++ b/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj
@@ -42,14 +42,17 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Threading.Tasks">
-      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.165\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
+    <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Threading.Tasks.Extensions">
-      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.165\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
-      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.165\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <Private>True</Private>
@@ -60,15 +63,15 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO">
-      <HintPath>..\..\packages\Microsoft.Bcl.1.1.6\lib\net40\System.IO.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll</HintPath>
     </Reference>
     <Reference Include="System.Net" />
     <Reference Include="System.Runtime">
-      <HintPath>..\..\packages\Microsoft.Bcl.1.1.6\lib\net40\System.Runtime.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Caching" />
     <Reference Include="System.Threading.Tasks">
-      <HintPath>..\..\packages\Microsoft.Bcl.1.1.6\lib\net40\System.Threading.Tasks.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Data" />
@@ -131,10 +134,10 @@
     </PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets')" />
+  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
   <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
-    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
-    <Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/ImageProcessor.Web/NET4/app.config b/src/ImageProcessor.Web/NET4/app.config
index 7d0ea2dd0..d7f44b988 100644
--- a/src/ImageProcessor.Web/NET4/app.config
+++ b/src/ImageProcessor.Web/NET4/app.config
@@ -4,11 +4,11 @@
         <assemblyBinding xmlns:bcl="urn:schemas-microsoft-com:bcl" xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly bcl:name="System.Runtime">
                 <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-2.5.19.0" newVersion="2.5.19.0" />
+                <bindingRedirect oldVersion="0.0.0.0-2.6.8.0" newVersion="2.6.8.0" />
             </dependentAssembly>
             <dependentAssembly bcl:name="System.Threading.Tasks">
                 <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-2.5.19.0" newVersion="2.5.19.0" />
+                <bindingRedirect oldVersion="0.0.0.0-2.6.8.0" newVersion="2.6.8.0" />
             </dependentAssembly>
         </assemblyBinding>
     </runtime>
diff --git a/src/ImageProcessor.Web/NET4/packages.config b/src/ImageProcessor.Web/NET4/packages.config
index 18cb40932..a4d062b2a 100644
--- a/src/ImageProcessor.Web/NET4/packages.config
+++ b/src/ImageProcessor.Web/NET4/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Bcl" version="1.1.6" targetFramework="net40" />
-  <package id="Microsoft.Bcl.Async" version="1.0.165" targetFramework="net40" />
-  <package id="Microsoft.Bcl.Build" version="1.0.13" targetFramework="net40" />
+  <package id="Microsoft.Bcl" version="1.1.8" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/ImageProcessor.Web/NET45/Helpers/RemoteFile.cs b/src/ImageProcessor.Web/NET45/Helpers/RemoteFile.cs
index 39dce8955..79ecfd29e 100644
--- a/src/ImageProcessor.Web/NET45/Helpers/RemoteFile.cs
+++ b/src/ImageProcessor.Web/NET45/Helpers/RemoteFile.cs
@@ -305,7 +305,7 @@ namespace ImageProcessor.Web.Helpers
         {
             if (!this.IgnoreRemoteDownloadSettings && !AllowRemoteDownloads)
             {
-                throw new SecurityException("application is not configured to allow remote file downloads.");
+                throw new SecurityException("Application is not configured to allow remote file downloads.");
             }
         }
 
@@ -351,11 +351,15 @@ namespace ImageProcessor.Web.Helpers
         /// </summary>
         private void CheckSafeUrlLocation()
         {
-            bool validUrl = RemoteFileWhiteList.Any(item => this.url.Host.ToUpperInvariant().StartsWith(item.Host.ToUpperInvariant()));
+            string upper = this.url.Host.ToUpperInvariant();
+
+            // Check for root or subdomain.
+            bool validUrl = RemoteFileWhiteList.Any(item =>
+                upper.StartsWith(item.Host.ToUpperInvariant()) || upper.EndsWith(item.Host.ToUpperInvariant()));
 
             if (!validUrl)
             {
-                throw new SecurityException("application is not configured to allow remote file downloads from this domain.");
+                throw new SecurityException("Application is not configured to allow remote file downloads from this domain.");
             }
         }
         #endregion
diff --git a/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs b/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
index 9fc9cc2eb..f3dee6b7a 100644
--- a/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
+++ b/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@ using ImageProcessor.Web.HttpModules;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.2.1.0")]
-[assembly: AssemblyFileVersion("3.2.1.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.2.2.0")]
+[assembly: AssemblyFileVersion("3.2.2.0")]
\ No newline at end of file
diff --git a/src/ImageProcessor.sln b/src/ImageProcessor.sln
index 2860e061c..beee7760a 100644
--- a/src/ImageProcessor.sln
+++ b/src/ImageProcessor.sln
@@ -32,8 +32,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor.Web_NET45",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_Website_Webforms_NET45", "TestWebsites\NET45\Test_Website_Webforms_NET45\Test_Website_Webforms_NET45.csproj", "{8DA47D8C-DB1A-4D82-843F-896AB9C3B3D2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_Website_MVC5_NET45", "TestWebsites\NET45\Test_Website_MVC5_NET45\Test_Website_MVC5_NET45.csproj", "{210AFC40-E24E-4B1D-BF3E-331C2138D5D9}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		All|Any CPU = All|Any CPU
@@ -172,21 +170,6 @@ Global
 		{8DA47D8C-DB1A-4D82-843F-896AB9C3B3D2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8DA47D8C-DB1A-4D82-843F-896AB9C3B3D2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8DA47D8C-DB1A-4D82-843F-896AB9C3B3D2}.Release|x86.ActiveCfg = Release|Any CPU
-		{210AFC40-E24E-4B1D-BF3E-331C2138D5D9}.All|Any CPU.ActiveCfg = Release|Any CPU
-		{210AFC40-E24E-4B1D-BF3E-331C2138D5D9}.All|Any CPU.Build.0 = Release|Any CPU
-		{210AFC40-E24E-4B1D-BF3E-331C2138D5D9}.All|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{210AFC40-E24E-4B1D-BF3E-331C2138D5D9}.All|Mixed Platforms.Build.0 = Release|Any CPU
-		{210AFC40-E24E-4B1D-BF3E-331C2138D5D9}.All|x86.ActiveCfg = Release|Any CPU
-		{210AFC40-E24E-4B1D-BF3E-331C2138D5D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{210AFC40-E24E-4B1D-BF3E-331C2138D5D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{210AFC40-E24E-4B1D-BF3E-331C2138D5D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{210AFC40-E24E-4B1D-BF3E-331C2138D5D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{210AFC40-E24E-4B1D-BF3E-331C2138D5D9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{210AFC40-E24E-4B1D-BF3E-331C2138D5D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{210AFC40-E24E-4B1D-BF3E-331C2138D5D9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{210AFC40-E24E-4B1D-BF3E-331C2138D5D9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{210AFC40-E24E-4B1D-BF3E-331C2138D5D9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{210AFC40-E24E-4B1D-BF3E-331C2138D5D9}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/ImageProcessor/Processors/Resize.cs b/src/ImageProcessor/Processors/Resize.cs
index e460e59f9..3a95203f7 100644
--- a/src/ImageProcessor/Processors/Resize.cs
+++ b/src/ImageProcessor/Processors/Resize.cs
@@ -32,13 +32,18 @@ namespace ImageProcessor.Processors
         /// <summary>
         /// The regular expression to search strings for.
         /// </summary>
-        private static readonly Regex QueryRegex = new Regex(@"((width|height)=\d+)|(mode=(pad|stretch|crop|max))|(anchor=(top|bottom|left|right|center))|(center=\d+(.\d+)?[,-]\d+(.\d+))|(bgcolor=(transparent|\d+,\d+,\d+,\d+|([0-9a-fA-F]{3}){1,2}))|(upscale=false)", RegexOptions.Compiled);
+        private static readonly Regex QueryRegex = new Regex(@"(width|height)=|(width|height)ratio=|mode=|anchor=|center=|bgcolor=|upscale=", RegexOptions.Compiled);
 
         /// <summary>
         /// The regular expression to search strings for the size attribute.
         /// </summary>
         private static readonly Regex SizeRegex = new Regex(@"(width|height)=\d+", RegexOptions.Compiled);
 
+        /// <summary>
+        /// The regular expression to search strings for the ratio attribute.
+        /// </summary>
+        private static readonly Regex RatioRegex = new Regex(@"(width|height)ratio=\d+(.\d+)?", RegexOptions.Compiled);
+
         /// <summary>
         /// The regular expression to search strings for the mode attribute.
         /// </summary>
@@ -130,10 +135,9 @@ namespace ImageProcessor.Processors
                     {
                         // Set the index on the first instance only.
                         this.SortOrder = match.Index;
+                        stringBuilder.Append(queryString);
                     }
 
-                    stringBuilder.Append(match.Value);
-
                     index += 1;
                 }
             }
@@ -364,26 +368,26 @@ namespace ImageProcessor.Processors
                     }
                 }
 
-				// Constrain the image to fit the maximum possible height or width.
-				if (resizeMode == ResizeMode.Max)
-				{
-					//If either is 0, we don't need to figure out orientation
-					if (width > 0 && height > 0)
-					{
-						//integers must be cast to doubles to get needed precision
-						double ratio = (double)height / width;
-						double sourceRatio = (double)sourceHeight / sourceWidth;
-
-						if (sourceRatio < ratio)
-						{
-							height = 0;
-						}
-						else
-						{
-							width = 0;
-						}
-					}
-				}
+                // Constrain the image to fit the maximum possible height or width.
+                if (resizeMode == ResizeMode.Max)
+                {
+                    // If either is 0, we don't need to figure out orientation
+                    if (width > 0 && height > 0)
+                    {
+                        // Integers must be cast to doubles to get needed precision
+                        double ratio = (double)height / width;
+                        double sourceRatio = (double)sourceHeight / sourceWidth;
+
+                        if (sourceRatio < ratio)
+                        {
+                            height = 0;
+                        }
+                        else
+                        {
+                            width = 0;
+                        }
+                    }
+                }
 
                 // If height or width is not passed we assume that the standard ratio is to be kept.
                 if (height == 0)
@@ -491,8 +495,10 @@ namespace ImageProcessor.Processors
         /// </returns>
         private Size ParseSize(string input)
         {
-            const string Width = "width";
-            const string Height = "height";
+            const string Width = "width=";
+            const string Height = "height=";
+            const string WidthRatio = "widthratio=";
+            const string HeightRatio = "heightratio=";
             Size size = new Size();
 
             // First merge the matches so we can parse .
@@ -526,6 +532,30 @@ namespace ImageProcessor.Processors
                     : new Size(dimensions[1], dimensions[0]);
             }
 
+            // Calculate any ratio driven sizes.
+            if (size.Width == 0 || size.Height == 0)
+            {
+                stringBuilder.Clear();
+                foreach (Match match in RatioRegex.Matches(input))
+                {
+                    stringBuilder.Append(match.Value);
+                }
+
+                value = stringBuilder.ToString();
+
+                // Replace 0 width
+                if (size.Width == 0 && size.Height > 0 && input.Contains(WidthRatio) && !input.Contains(HeightRatio))
+                {
+                    size.Width = (int)(value.ToPositiveFloatArray()[0] * size.Height);
+                }
+
+                // Replace 0 height
+                if (size.Height == 0 && size.Width > 0 && input.Contains(HeightRatio) && !input.Contains(WidthRatio))
+                {
+                    size.Height = (int)(value.ToPositiveFloatArray()[0] * size.Width);
+                }
+            }
+
             return size;
         }
 
diff --git a/src/ImageProcessor/Properties/AssemblyInfo.cs b/src/ImageProcessor/Properties/AssemblyInfo.cs
index 901fe97cc..f7c90f178 100644
--- a/src/ImageProcessor/Properties/AssemblyInfo.cs
+++ b/src/ImageProcessor/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@ using System.Security;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.8.7.0")]
-[assembly: AssemblyFileVersion("1.8.7.0")]
+[assembly: AssemblyVersion("1.8.8.0")]
+[assembly: AssemblyFileVersion("1.8.8.0")]
 
diff --git a/src/Nuget/ImageProcessor.1.8.6.0.nupkg.REMOVED.git-id b/src/Nuget/ImageProcessor.1.8.6.0.nupkg.REMOVED.git-id
deleted file mode 100644
index 241965cae..000000000
--- a/src/Nuget/ImageProcessor.1.8.6.0.nupkg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-8aabc0ada547c28930a04d63f23c2d7e429ef88d
\ No newline at end of file
diff --git a/src/Nuget/ImageProcessor.1.8.6.1.nupkg.REMOVED.git-id b/src/Nuget/ImageProcessor.1.8.6.1.nupkg.REMOVED.git-id
deleted file mode 100644
index d19d9979d..000000000
--- a/src/Nuget/ImageProcessor.1.8.6.1.nupkg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-9057207691dbc6401636b864351771e96c9a4eae
\ No newline at end of file
diff --git a/src/Nuget/ImageProcessor.1.8.8.0.nupkg b/src/Nuget/ImageProcessor.1.8.8.0.nupkg
new file mode 100644
index 000000000..8e0c17a74
Binary files /dev/null and b/src/Nuget/ImageProcessor.1.8.8.0.nupkg differ
diff --git a/src/Nuget/ImageProcessor.Web.3.1.1.0.nupkg b/src/Nuget/ImageProcessor.Web.3.1.1.0.nupkg
deleted file mode 100644
index 2a8f9ef3b..000000000
Binary files a/src/Nuget/ImageProcessor.Web.3.1.1.0.nupkg and /dev/null differ
diff --git a/src/Nuget/ImageProcessor.Web.3.2.0.0.nupkg b/src/Nuget/ImageProcessor.Web.3.2.0.0.nupkg
deleted file mode 100644
index 5396c4078..000000000
Binary files a/src/Nuget/ImageProcessor.Web.3.2.0.0.nupkg and /dev/null differ
diff --git a/src/Nuget/ImageProcessor.Web.3.2.2.0.nupkg b/src/Nuget/ImageProcessor.Web.3.2.2.0.nupkg
new file mode 100644
index 000000000..596c2af69
Binary files /dev/null and b/src/Nuget/ImageProcessor.Web.3.2.2.0.nupkg differ
diff --git a/src/TestWebsites/NET4/Test_Website_MVC_NET4.csproj b/src/TestWebsites/NET4/Test_Website_MVC_NET4.csproj
index 8a92fd9da..b8d3b29dc 100644
--- a/src/TestWebsites/NET4/Test_Website_MVC_NET4.csproj
+++ b/src/TestWebsites/NET4/Test_Website_MVC_NET4.csproj
@@ -56,25 +56,28 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Threading.Tasks">
-      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.165\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
+    <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Threading.Tasks.Extensions">
-      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.165\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
-      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.165\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
     </Reference>
     <Reference Include="System.Data.Entity" />
     <Reference Include="System.IO">
-      <HintPath>..\..\packages\Microsoft.Bcl.1.1.6\lib\net40\System.IO.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll</HintPath>
     </Reference>
     <Reference Include="System.Net" />
     <Reference Include="System.Runtime">
-      <HintPath>..\..\packages\Microsoft.Bcl.1.1.6\lib\net40\System.Runtime.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks">
-      <HintPath>..\..\packages\Microsoft.Bcl.1.1.6\lib\net40\System.Threading.Tasks.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
@@ -232,12 +235,12 @@
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets')" />
-  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
-    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
-    <Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
-  </Target>
   <Target Name="AfterBuild">
     <Exec Command="xcopy &quot;$(SolutionDir)Images&quot; &quot;$(ProjectDir)Images&quot; /S /Y /I" />
   </Target>
+  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/TestWebsites/NET4/Web.config b/src/TestWebsites/NET4/Web.config
index 516e05cbd..015f2c612 100644
--- a/src/TestWebsites/NET4/Web.config
+++ b/src/TestWebsites/NET4/Web.config
@@ -50,7 +50,7 @@
   </system.web>
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false" />
-    <modules runAllManagedModulesForAllRequests="true"/>   
+    <modules runAllManagedModulesForAllRequests="true" />   
   </system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -60,11 +60,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.6.6.0" newVersion="2.6.6.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.8.0" newVersion="2.6.8.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.6.6.0" newVersion="2.6.6.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.8.0" newVersion="2.6.8.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/src/TestWebsites/NET4/packages.config b/src/TestWebsites/NET4/packages.config
index 86eb14bb5..fd0874c23 100644
--- a/src/TestWebsites/NET4/packages.config
+++ b/src/TestWebsites/NET4/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Bcl" version="1.1.6" targetFramework="net40" />
-  <package id="Microsoft.Bcl.Async" version="1.0.165" targetFramework="net40" />
-  <package id="Microsoft.Bcl.Build" version="1.0.13" targetFramework="net40" />
+  <package id="Microsoft.Bcl" version="1.1.8" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
+  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" />
 </packages>
\ No newline at end of file