diff --git a/Asterisk.2013/Asterisk.NET.Test/Asterisk.NET.Test/AsterNET.Test.csproj b/Asterisk.2013/Asterisk.NET.Test/Asterisk.NET.Test/AsterNET.Test.csproj
index 39125cd..3ab171c 100644
--- a/Asterisk.2013/Asterisk.NET.Test/Asterisk.NET.Test/AsterNET.Test.csproj
+++ b/Asterisk.2013/Asterisk.NET.Test/Asterisk.NET.Test/AsterNET.Test.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,7 +11,7 @@
     <RootNamespace>Asterisk.NET.Test</RootNamespace>
     <AssemblyName>Asterisk.NET.Test</AssemblyName>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
diff --git a/Asterisk.2013/Asterisk.NET.Test/Asterisk.NET.Test/app.config b/Asterisk.2013/Asterisk.NET.Test/Asterisk.NET.Test/app.config
index b7a7ef1..2e71eab 100644
--- a/Asterisk.2013/Asterisk.NET.Test/Asterisk.NET.Test/app.config
+++ b/Asterisk.2013/Asterisk.NET.Test/Asterisk.NET.Test/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
diff --git a/Asterisk.2013/Asterisk.NET.WinForm/AsterNET.WinForm.csproj b/Asterisk.2013/Asterisk.NET.WinForm/AsterNET.WinForm.csproj
index f4c93c4..6c0282d 100644
--- a/Asterisk.2013/Asterisk.NET.WinForm/AsterNET.WinForm.csproj
+++ b/Asterisk.2013/Asterisk.NET.WinForm/AsterNET.WinForm.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Asterisk.NET.WinForm</RootNamespace>
     <AssemblyName>Asterisk.NET.WinForm</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
diff --git a/Asterisk.2013/Asterisk.NET.WinForm/Properties/Resources.Designer.cs b/Asterisk.2013/Asterisk.NET.WinForm/Properties/Resources.Designer.cs
index feccfcb..8ebe8e5 100644
--- a/Asterisk.2013/Asterisk.NET.WinForm/Properties/Resources.Designer.cs
+++ b/Asterisk.2013/Asterisk.NET.WinForm/Properties/Resources.Designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AsterNET.WinForm.Properties {
+namespace Asterisk.NET.WinForm.Properties {
     using System;
     
     
@@ -19,7 +19,7 @@ namespace AsterNET.WinForm.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -39,7 +39,7 @@ namespace AsterNET.WinForm.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AsterNET.WinForm.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Asterisk.NET.WinForm.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/Asterisk.2013/Asterisk.NET.WinForm/Properties/Settings.Designer.cs b/Asterisk.2013/Asterisk.NET.WinForm/Properties/Settings.Designer.cs
index ba6bd99..cab29c8 100644
--- a/Asterisk.2013/Asterisk.NET.WinForm/Properties/Settings.Designer.cs
+++ b/Asterisk.2013/Asterisk.NET.WinForm/Properties/Settings.Designer.cs
@@ -1,18 +1,18 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AsterNET.WinForm.Properties {
+namespace Asterisk.NET.WinForm.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Asterisk.2013/Asterisk.NET.WinForm/app.config b/Asterisk.2013/Asterisk.NET.WinForm/app.config
index b7a7ef1..2e71eab 100644
--- a/Asterisk.2013/Asterisk.NET.WinForm/app.config
+++ b/Asterisk.2013/Asterisk.NET.WinForm/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
diff --git a/Asterisk.2013/Asterisk.NET/AsterNET.csproj b/Asterisk.2013/Asterisk.NET/AsterNET.csproj
index 20803b2..5a37305 100644
--- a/Asterisk.2013/Asterisk.NET/AsterNET.csproj
+++ b/Asterisk.2013/Asterisk.NET/AsterNET.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <Version>1.3.0</Version>
     <Copyright>Copyright © 2017</Copyright>
     <Authors>Ben Merrills</Authors>
@@ -12,7 +12,7 @@
     <PackageReleaseNotes>Please see: https://github.com/AsterNET/AsterNET/commits/master</PackageReleaseNotes>
     <Configurations>Debug;Release;Travis</Configurations>
   </PropertyGroup>
-  
+
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
diff --git a/Asterisk.2013/Asterisk.NET/FastAGI/AGIRequest.cs b/Asterisk.2013/Asterisk.NET/FastAGI/AGIRequest.cs
index c8d67fc..9985f3a 100644
--- a/Asterisk.2013/Asterisk.NET/FastAGI/AGIRequest.cs
+++ b/Asterisk.2013/Asterisk.NET/FastAGI/AGIRequest.cs
@@ -557,12 +557,12 @@ namespace AsterNET.FastAGI
                 int i = parameter.IndexOf('=');
                 if (i > 0)
                 {
-                    name = HttpUtility.UrlDecode(parameter.Substring(0, i));
+                    name = WebUtility.UrlDecode(parameter.Substring(0, i));
                     if (parameter.Length > i + 1)
-                        val = HttpUtility.UrlDecode(parameter.Substring(i + 1));
+                        val = WebUtility.UrlDecode(parameter.Substring(i + 1));
                 }
                 else if (i < 0)
-                    name = HttpUtility.UrlDecode(parameter);
+                    name = WebUtility.UrlDecode(parameter);
                 else
                     continue;
 
diff --git a/Asterisk.2013/Asterisk.NET/Manager/ResponseHandlers/TaskResponseHandler.cs b/Asterisk.2013/Asterisk.NET/Manager/ResponseHandlers/TaskResponseHandler.cs
index d96ccbf..7d09607 100644
--- a/Asterisk.2013/Asterisk.NET/Manager/ResponseHandlers/TaskResponseHandler.cs
+++ b/Asterisk.2013/Asterisk.NET/Manager/ResponseHandlers/TaskResponseHandler.cs
@@ -10,7 +10,7 @@ namespace AsterNET.Manager.Response
     {
         public TaskResponseHandler(ManagerAction action)
         {
-            TaskCompletionSource = new TaskCompletionSource<ManagerResponse>();
+            TaskCompletionSource = new TaskCompletionSource<ManagerResponse>(TaskCreationOptions.RunContinuationsAsynchronously);
             Action = action;
         }