diff --git a/.gitignore b/.gitignore
index bdc3535..66e2387 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,3 +106,5 @@ Generated_Code #added for RIA/Silverlight projects
 _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
+/.vs/RedGate.AppHost/v15/Server/sqlite3
+/.vs/RedGate.AppHost/v16/TestStore/0
diff --git a/NuSpec/RedGate.AppHost.nuspec b/NuSpec/RedGate.AppHost.nuspec
index ac59c47..366f360 100644
--- a/NuSpec/RedGate.AppHost.nuspec
+++ b/NuSpec/RedGate.AppHost.nuspec
@@ -1,44 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
-    <id>RedGate.AppHost</id>
-    <version>1.0.0</version>
-    <title>Red Gate Out of Process App Host</title>
+    <id>CefSharp-Remoting.RedGate.AppHost</id>
+    <version>1.0.4</version>
+    <title>CefSharp-Remoting fork of Red Gate Out of Process App Host</title>
     <authors>Red Gate</authors>
     <owners>Red Gate</owners>
-    <projectUrl>https://github.com/red-gate/RedGate.AppHost</projectUrl>
+    <projectUrl>https://github.com/rupertsciamenna89/RedGate.AppHost</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Provides a way to host a UI out of process and remote it in</description>
-    <summary>Provides a way to host a UI out of process and remote it in</summary>
+    <description>Provides a way to host a UI out of process and remote it in. It's a CefSharp-Remoting fork. This package must not be used for production environment. It has only educative purpose.</description>
+    <summary>Provides a way to host a UI out of process and remote it in.  It's a CefSharp-Remoting fork.</summary>
     <references>
-      <reference file="RedGate.AppHost.Server.dll" />
-      <reference file="RedGate.AppHost.Interfaces.dll" />
-      <reference file="RedGate.AppHost.Remoting.WPF.dll" />
+      <group targetFramework="net452">
+        <reference file="RedGate.AppHost.Server.dll" />
+        <reference file="RedGate.AppHost.Interfaces.dll" />
+        <reference file="RedGate.AppHost.Remoting.WPF.dll" />
+      </group>
     </references>
-  <dependencies>
-    <dependency id="CommandLineParser" version="1.9.71" />
-  </dependencies>
+    <dependencies>
+      <group targetFramework="net452">
+        <dependency id="CommandLineParser" version="2.2.1" />
+      </group>
+    </dependencies>
   </metadata>
   <files>
     <file src="RedGate.AppHost.Client.exe" target="AppHostClientExe" />
     <file src="RedGate.AppHost.Client.pdb" target="AppHostClientExe" />
     <file src="RedGate.AppHost.Client.x64.exe" target="AppHostClientExe" />
     <file src="RedGate.AppHost.Client.x64.pdb" target="AppHostClientExe" />
-    
+
     <file src="Build\RedGate.AppHost.targets" target="Build" />
-    
-    <file src="RedGate.AppHost.Example.Client.dll" target="lib" />
-    <file src="RedGate.AppHost.Example.Server.exe" target="lib" />
-    <file src="RedGate.AppHost.Example.Remote.Services.dll" target="lib" />
-    <file src="RedGate.AppHost.Interfaces.dll" target="lib" />
-    <file src="RedGate.AppHost.Interfaces.pdb" target="lib" />
-    <file src="RedGate.AppHost.Remoting.dll" target="lib" />
-    <file src="RedGate.AppHost.Remoting.pdb" target="lib" />
-    <file src="RedGate.AppHost.Remoting.WPF.dll" target="lib" />
-    <file src="RedGate.AppHost.Remoting.WPF.pdb" target="lib" />
-    <file src="RedGate.AppHost.Server.dll" target="lib" />
-    <file src="RedGate.AppHost.Server.pdb" target="lib" />
-    
+
+    <file src="RedGate.AppHost.Example.Client.dll" target="lib\net452\" />
+    <file src="RedGate.AppHost.Example.Server.exe" target="lib\net452\" />
+    <file src="RedGate.AppHost.Example.Remote.Services.dll" target="lib\net452\" />
+    <file src="RedGate.AppHost.Interfaces.dll" target="lib\net452\" />
+    <file src="RedGate.AppHost.Interfaces.pdb" target="lib\net452\" />
+    <file src="RedGate.AppHost.Remoting.dll" target="lib\net452\" />
+    <file src="RedGate.AppHost.Remoting.pdb" target="lib\net452\" />
+    <file src="RedGate.AppHost.Remoting.WPF.dll" target="lib\net452\" />
+    <file src="RedGate.AppHost.Remoting.WPF.pdb" target="lib\net452\" />
+    <file src="RedGate.AppHost.Server.dll" target="lib\net452\" />
+    <file src="RedGate.AppHost.Server.pdb" target="lib\net452\" />
+        
+    <file src="RedGate.AppHost.Interfaces.dll" target="ref\net452\" />
+    <file src="RedGate.AppHost.Server.dll" target="ref\net452\" />
+    <file src="RedGate.AppHost.Remoting.WPF.dll" target="ref\net452\" />
+
     <file src="RedGate.AppHost.wxs" target="WiX2\RedGate.AppHost.wxs" />
   </files>
 </package>
diff --git a/RedGate.AppHost.Client/Program.cs b/RedGate.AppHost.Client/Program.cs
index 2fb49c1..5f8b882 100644
--- a/RedGate.AppHost.Client/Program.cs
+++ b/RedGate.AppHost.Client/Program.cs
@@ -17,9 +17,10 @@ internal static class Program
         [STAThread]
         private static void Main(string[] args)
         {
-            var options = new Options();
-            if (Parser.Default.ParseArguments(args, options))
-            {
+            var parseResult = Parser.Default.ParseArguments<Options>(args);
+
+            if (parseResult.Tag == ParserResultType.Parsed) {
+                var options = parseResult.MapResult(el => el, el => null);
 #if DEBUG
                 options.Debug = true;
 #endif
diff --git a/RedGate.AppHost.Client/RedGate.AppHost.Client.csproj b/RedGate.AppHost.Client/RedGate.AppHost.Client.csproj
index 06e6abb..cdd3b0b 100644
--- a/RedGate.AppHost.Client/RedGate.AppHost.Client.csproj
+++ b/RedGate.AppHost.Client/RedGate.AppHost.Client.csproj
@@ -9,10 +9,26 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RedGate.AppHost.Client</RootNamespace>
     <AssemblyName>RedGate.AppHost.Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>\\red-gate.com\Files\RG_Build_Key\RedGate.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>RedGate_AppHost.snk</AssemblyOriginatorKeyFile>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />
@@ -26,6 +42,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
@@ -36,6 +53,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -46,6 +64,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\Build\Release\</OutputPath>
@@ -56,6 +75,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <!-- Don't try to sign if it's built inside visual studio, there's probably no point -->
   <PropertyGroup Condition="'$(BuildingInsideVisualStudio)' == ''">
@@ -70,8 +90,8 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommandLine">
-      <HintPath>..\packages\CommandLineParser.1.9.71\lib\net40\CommandLine.dll</HintPath>
+    <Reference Include="CommandLine, Version=2.8.0.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommandLineParser.2.8.0\lib\net45\CommandLine.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -110,12 +130,31 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="app.manifest" />
     <None Include="packages.config" />
+    <None Include="RedGate_AppHost.snk" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="honeycomb.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 %28x86 e x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.4.5">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 4.5</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RedGate_BuildTargetsPath)" Condition="'$(BuildingInsideVisualStudio)' == ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/RedGate.AppHost.Client/RedGate.AppHost.Client.x64.csproj b/RedGate.AppHost.Client/RedGate.AppHost.Client.x64.csproj
index 19d4eef..cedbf51 100644
--- a/RedGate.AppHost.Client/RedGate.AppHost.Client.x64.csproj
+++ b/RedGate.AppHost.Client/RedGate.AppHost.Client.x64.csproj
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RedGate.AppHost.Client</RootNamespace>
     <AssemblyName>RedGate.AppHost.Client.x64</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>\\red-gate.com\Files\RG_Build_Key\RedGate.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>RedGate_AppHost.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />
@@ -26,6 +27,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>..\Build\Release\</OutputPath>
@@ -36,6 +38,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -46,6 +49,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -56,6 +60,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <!-- Don't try to sign if it's built inside visual studio, there's probably no point -->
   <PropertyGroup Condition="'$(BuildingInsideVisualStudio)' == ''">
@@ -68,8 +73,8 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommandLine">
-      <HintPath>..\packages\CommandLineParser.1.9.71\lib\net40\CommandLine.dll</HintPath>
+    <Reference Include="CommandLine, Version=2.8.0.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommandLineParser.2.8.0\lib\net45\CommandLine.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -108,8 +113,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="app.manifest" />
     <None Include="packages.config" />
+    <None Include="RedGate_AppHost.snk" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="honeycomb.ico" />
diff --git a/RedGate.AppHost.Client/RedGate_AppHost.snk b/RedGate.AppHost.Client/RedGate_AppHost.snk
new file mode 100644
index 0000000..b5b5d36
Binary files /dev/null and b/RedGate.AppHost.Client/RedGate_AppHost.snk differ
diff --git a/RedGate.AppHost.Client/app.config b/RedGate.AppHost.Client/app.config
new file mode 100644
index 0000000..ff99501
--- /dev/null
+++ b/RedGate.AppHost.Client/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
diff --git a/RedGate.AppHost.Client/packages.config b/RedGate.AppHost.Client/packages.config
index 7f3f641..8ba0218 100644
--- a/RedGate.AppHost.Client/packages.config
+++ b/RedGate.AppHost.Client/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CommandLineParser" version="1.9.71" targetFramework="net40" />
+  <package id="CommandLineParser" version="2.8.0" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/RedGate.AppHost.Example.Client/RedGate.AppHost.Example.Client.csproj b/RedGate.AppHost.Example.Client/RedGate.AppHost.Example.Client.csproj
index 3692b35..591dbf9 100644
--- a/RedGate.AppHost.Example.Client/RedGate.AppHost.Example.Client.csproj
+++ b/RedGate.AppHost.Example.Client/RedGate.AppHost.Example.Client.csproj
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RedGate.AppHost.Example.Client</RootNamespace>
     <AssemblyName>RedGate.AppHost.Example.Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>\\red-gate.com\Files\RG_Build_Key\RedGate.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,6 +24,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,6 +34,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
diff --git a/RedGate.AppHost.Example.Remote.Services/RedGate.AppHost.Example.Remote.Services.csproj b/RedGate.AppHost.Example.Remote.Services/RedGate.AppHost.Example.Remote.Services.csproj
index 271d8b4..849ec04 100644
--- a/RedGate.AppHost.Example.Remote.Services/RedGate.AppHost.Example.Remote.Services.csproj
+++ b/RedGate.AppHost.Example.Remote.Services/RedGate.AppHost.Example.Remote.Services.csproj
@@ -9,10 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RedGate.AppHost.Example.Remote.Services</RootNamespace>
     <AssemblyName>RedGate.AppHost.Example.Remote.Services</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>\\red-gate.com\Files\RG_Build_Key\RedGate.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -23,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/RedGate.AppHost.Example.Server/Properties/Resources.Designer.cs b/RedGate.AppHost.Example.Server/Properties/Resources.Designer.cs
index 32ed4e7..76f7a99 100644
--- a/RedGate.AppHost.Example.Server/Properties/Resources.Designer.cs
+++ b/RedGate.AppHost.Example.Server/Properties/Resources.Designer.cs
@@ -1,69 +1,61 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18408
+//     Il codice è stato generato da uno strumento.
+//     Versione runtime:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se
+//     il codice viene rigenerato.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RedGate.AppHost.Example.Server.Properties
-{
-
-
+namespace RedGate.AppHost.Example.Server.Properties {
+    using System;
+    
+    
     /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    ///   Classe di risorse fortemente tipizzata per la ricerca di stringhe localizzate e così via.
     /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // 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.
+    // Questa classe è stata generata automaticamente dalla classe StronglyTypedResourceBuilder.
+    // tramite uno strumento quale ResGen o Visual Studio.
+    // Per aggiungere o rimuovere un membro, modificare il file con estensione ResX ed eseguire nuovamente ResGen
+    // con l'opzione /str oppure ricompilare il progetto VS.
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
+        ///   Restituisce l'istanza di ResourceManager nella cache utilizzata da questa classe.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("RedGate.AppHost.Example.Server.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
+        ///   Esegue l'override della proprietà CurrentUICulture del thread corrente per tutte le
+        ///   ricerche di risorse eseguite utilizzando questa classe di risorse fortemente tipizzata.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/RedGate.AppHost.Example.Server/Properties/Settings.Designer.cs b/RedGate.AppHost.Example.Server/Properties/Settings.Designer.cs
index 76e40a6..7d7152b 100644
--- a/RedGate.AppHost.Example.Server/Properties/Settings.Designer.cs
+++ b/RedGate.AppHost.Example.Server/Properties/Settings.Designer.cs
@@ -1,28 +1,24 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18408
+//     Il codice è stato generato da uno strumento.
+//     Versione runtime:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se
+//     il codice viene rigenerato.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RedGate.AppHost.Example.Server.Properties
-{
-
-
+namespace RedGate.AppHost.Example.Server.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff --git a/RedGate.AppHost.Example.Server/RedGate.AppHost.Example.Server.csproj b/RedGate.AppHost.Example.Server/RedGate.AppHost.Example.Server.csproj
index 1ad3654..b354229 100644
--- a/RedGate.AppHost.Example.Server/RedGate.AppHost.Example.Server.csproj
+++ b/RedGate.AppHost.Example.Server/RedGate.AppHost.Example.Server.csproj
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RedGate.AppHost.Example.Server</RootNamespace>
     <AssemblyName>RedGate.AppHost.Example.Server</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>\\red-gate.com\Files\RG_Build_Key\RedGate.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -24,6 +25,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -34,6 +36,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -90,6 +93,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/RedGate.AppHost.Example.Server/app.config b/RedGate.AppHost.Example.Server/app.config
new file mode 100644
index 0000000..ff99501
--- /dev/null
+++ b/RedGate.AppHost.Example.Server/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
diff --git a/RedGate.AppHost.Interfaces/RedGate.AppHost.Interfaces.csproj b/RedGate.AppHost.Interfaces/RedGate.AppHost.Interfaces.csproj
index c838c64..f0d320f 100644
--- a/RedGate.AppHost.Interfaces/RedGate.AppHost.Interfaces.csproj
+++ b/RedGate.AppHost.Interfaces/RedGate.AppHost.Interfaces.csproj
@@ -9,10 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RedGate.AppHost.Interfaces</RootNamespace>
     <AssemblyName>RedGate.AppHost.Interfaces</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>\\red-gate.com\Files\RG_Build_Key\RedGate.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>RedGate_AppHost.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -24,6 +24,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,10 +34,12 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <!-- Don't try to sign if it's built inside visual studio, there's probably no point -->
   <PropertyGroup Condition="'$(BuildingInsideVisualStudio)' == ''">
-    <RedGate_DontObfuscate>true</RedGate_DontObfuscate> <!-- Need to set this to tell signing task where to look for assembly -->
+    <RedGate_DontObfuscate>true</RedGate_DontObfuscate>
+    <!-- Need to set this to tell signing task where to look for assembly -->
     <RedGate_DoSign>true</RedGate_DoSign>
   </PropertyGroup>
   <ItemGroup>
@@ -60,6 +63,9 @@
     <Compile Include="IRemoteElement.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="RedGate_AppHost.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RedGate_BuildTargetsPath)" Condition="'$(BuildingInsideVisualStudio)' == ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/RedGate.AppHost.Interfaces/RedGate_AppHost.snk b/RedGate.AppHost.Interfaces/RedGate_AppHost.snk
new file mode 100644
index 0000000..6efdcb7
Binary files /dev/null and b/RedGate.AppHost.Interfaces/RedGate_AppHost.snk differ
diff --git a/RedGate.AppHost.Remoting.WPF/RedGate.AppHost.Remoting.WPF.csproj b/RedGate.AppHost.Remoting.WPF/RedGate.AppHost.Remoting.WPF.csproj
index f629782..659ec8b 100644
--- a/RedGate.AppHost.Remoting.WPF/RedGate.AppHost.Remoting.WPF.csproj
+++ b/RedGate.AppHost.Remoting.WPF/RedGate.AppHost.Remoting.WPF.csproj
@@ -9,10 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RedGate.AppHost.Remoting.WPF</RootNamespace>
     <AssemblyName>RedGate.AppHost.Remoting.WPF</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>\\red-gate.com\Files\RG_Build_Key\RedGate.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>RedGate_AppHost.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -24,6 +24,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,10 +33,12 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <!-- Don't try to sign if it's built inside visual studio, there's probably no point -->
   <PropertyGroup Condition="'$(BuildingInsideVisualStudio)' == ''">
-    <RedGate_DontObfuscate>true</RedGate_DontObfuscate> <!-- Need to set this to tell signing task where to look for assembly -->
+    <RedGate_DontObfuscate>true</RedGate_DontObfuscate>
+    <!-- Need to set this to tell signing task where to look for assembly -->
     <RedGate_DoSign>true</RedGate_DoSign>
   </PropertyGroup>
   <ItemGroup>
@@ -66,6 +69,9 @@
       <Name>RedGate.AppHost.Interfaces</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="RedGate_AppHost.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RedGate_BuildTargetsPath)" Condition="'$(BuildingInsideVisualStudio)' == ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/RedGate.AppHost.Remoting.WPF/RedGate_AppHost.snk b/RedGate.AppHost.Remoting.WPF/RedGate_AppHost.snk
new file mode 100644
index 0000000..7941bab
Binary files /dev/null and b/RedGate.AppHost.Remoting.WPF/RedGate_AppHost.snk differ
diff --git a/RedGate.AppHost.Remoting/RedGate.AppHost.Remoting.csproj b/RedGate.AppHost.Remoting/RedGate.AppHost.Remoting.csproj
index f052849..e5dfb6e 100644
--- a/RedGate.AppHost.Remoting/RedGate.AppHost.Remoting.csproj
+++ b/RedGate.AppHost.Remoting/RedGate.AppHost.Remoting.csproj
@@ -9,10 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RedGate.AppHost.Remoting</RootNamespace>
     <AssemblyName>RedGate.AppHost.Remoting</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>\\red-gate.com\Files\RG_Build_Key\RedGate.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>RedGate_AppHost.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -24,6 +24,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,10 +34,12 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <!-- Don't try to sign if it's built inside visual studio, there's probably no point -->
   <PropertyGroup Condition="'$(BuildingInsideVisualStudio)' == ''">
-    <RedGate_DontObfuscate>true</RedGate_DontObfuscate> <!-- Need to set this to tell signing task where to look for assembly -->
+    <RedGate_DontObfuscate>true</RedGate_DontObfuscate>
+    <!-- Need to set this to tell signing task where to look for assembly -->
     <RedGate_DoSign>true</RedGate_DoSign>
   </PropertyGroup>
   <ItemGroup>
@@ -52,6 +55,9 @@
     <Compile Include="ClientChannelSinkProviderForParticularServer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="RedGate_AppHost.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RedGate_BuildTargetsPath)" Condition="'$(BuildingInsideVisualStudio)' == ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/RedGate.AppHost.Remoting/RedGate_AppHost.snk b/RedGate.AppHost.Remoting/RedGate_AppHost.snk
new file mode 100644
index 0000000..08f12e1
Binary files /dev/null and b/RedGate.AppHost.Remoting/RedGate_AppHost.snk differ
diff --git a/RedGate.AppHost.Server/ChildProcessFactory.cs b/RedGate.AppHost.Server/ChildProcessFactory.cs
index 30a045e..d3c13fb 100644
--- a/RedGate.AppHost.Server/ChildProcessFactory.cs
+++ b/RedGate.AppHost.Server/ChildProcessFactory.cs
@@ -2,17 +2,20 @@
 {
     public class ChildProcessFactory
     {
-        public IChildProcessHandle Create(string assemblyName, bool openDebugConsole, bool is64Bit, bool monitorHostProcess)
-        {
+        public string ClientExecutablePath { get; set; }
+
+        public IChildProcessHandle Create(string assemblyName, bool openDebugConsole = false, bool is64Bit = false, bool monitorHostProcess = false) {
             IProcessStartOperation processStarter;
 
-            if (is64Bit)
-            {
-                processStarter = new ProcessStarter64Bit();
+            if (is64Bit) {
+                processStarter = new ProcessStarter64Bit() {
+                    ClientExecutablePath = ClientExecutablePath
+                };
             }
-            else
-            {
-                processStarter = new ProcessStarter32Bit();
+            else {
+                processStarter = new ProcessStarter32Bit() {
+                    ClientExecutablePath = ClientExecutablePath
+                };
             }
 
             return new RemotedProcessBootstrapper(
@@ -20,22 +23,6 @@ public IChildProcessHandle Create(string assemblyName, bool openDebugConsole, bo
                     new StartProcessWithJobSupport(
                         processStarter))).Create(assemblyName, openDebugConsole, monitorHostProcess);
         }
-
-        // the methods below are to support legacy versions of the API to the Create() method
-
-        public IChildProcessHandle Create(string assemblyName, bool openDebugConsole, bool is64Bit)
-        {
-            return Create(assemblyName, openDebugConsole, is64Bit, false);
-        }
-
-        public IChildProcessHandle Create(string assemblyName, bool openDebugConsole)
-        {
-            return Create(assemblyName, openDebugConsole, false);
-        }
-
-        public IChildProcessHandle Create(string assemblyName)
-        {
-            return Create(assemblyName, false, false);
-        }
+        
     }
 }
diff --git a/RedGate.AppHost.Server/ChildProcessHandle.cs b/RedGate.AppHost.Server/ChildProcessHandle.cs
index f288b60..74a0609 100644
--- a/RedGate.AppHost.Server/ChildProcessHandle.cs
+++ b/RedGate.AppHost.Server/ChildProcessHandle.cs
@@ -26,10 +26,7 @@ public FrameworkElement CreateElement(IAppHostServices services)
             }
             catch (RemotingException)
             {
-                if (m_Process != null)
-                {
-                    m_Process.KillAndDispose();
-                }
+                m_Process?.KillAndDispose();
                 throw;
             }
         }
diff --git a/RedGate.AppHost.Server/Native.cs b/RedGate.AppHost.Server/Native.cs
index 1ee1ff1..62d4b1b 100644
--- a/RedGate.AppHost.Server/Native.cs
+++ b/RedGate.AppHost.Server/Native.cs
@@ -14,7 +14,7 @@ internal static void ThrowOnFailure(Func<bool> action)
             if (!ret)
             {
                 int error = Marshal.GetLastWin32Error();
-                throw new ApplicationException(string.Format("ERROR: {0} failed with error code {1}", action.Method, error));
+                throw new ApplicationException($"ERROR: {action.Method} failed with error code {error}");
             }
         }
 
diff --git a/RedGate.AppHost.Server/ProcessStarter.cs b/RedGate.AppHost.Server/ProcessStarter.cs
index c7d42b5..73fa6df 100644
--- a/RedGate.AppHost.Server/ProcessStarter.cs
+++ b/RedGate.AppHost.Server/ProcessStarter.cs
@@ -8,9 +8,13 @@ internal abstract class ProcessStarter : IProcessStartOperation
     {
         protected abstract string ProcessFileName { get; }
 
-        public Process StartProcess(string assemblyName, string remotingId, bool openDebugConsole, bool monitorHostProcess)
-        {
-            string executingDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+        public string ClientExecutablePath { get; set; }
+
+        public Process StartProcess(string assemblyName, string remotingId, bool openDebugConsole, bool monitorHostProcess) {
+            string executingDirectory = string.IsNullOrEmpty(ClientExecutablePath)
+                                            ? Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
+                                            : ClientExecutablePath;
+            
             string quotedAssemblyArg = "\"" + Path.Combine(executingDirectory, assemblyName) + "\"";
 
             var processToStart = Path.Combine(executingDirectory, ProcessFileName);
diff --git a/RedGate.AppHost.Server/RedGate.AppHost.Server.csproj b/RedGate.AppHost.Server/RedGate.AppHost.Server.csproj
index d95c47e..f53c829 100644
--- a/RedGate.AppHost.Server/RedGate.AppHost.Server.csproj
+++ b/RedGate.AppHost.Server/RedGate.AppHost.Server.csproj
@@ -9,10 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RedGate.AppHost.Server</RootNamespace>
     <AssemblyName>RedGate.AppHost.Server</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>\\red-gate.com\Files\RG_Build_Key\RedGate.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>RedGate_AppHost.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -24,6 +24,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,6 +34,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <!-- Don't try to sign if it's built inside visual studio, there's probably no point -->
   <PropertyGroup Condition="'$(BuildingInsideVisualStudio)' == ''">
@@ -84,6 +86,9 @@
       <Name>RedGate.AppHost.Remoting</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="RedGate_AppHost.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RedGate_BuildTargetsPath)" Condition="'$(BuildingInsideVisualStudio)' == ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/RedGate.AppHost.Server/RedGate_AppHost.snk b/RedGate.AppHost.Server/RedGate_AppHost.snk
new file mode 100644
index 0000000..29e2413
Binary files /dev/null and b/RedGate.AppHost.Server/RedGate_AppHost.snk differ
diff --git a/RedGate.AppHost.Server/RemotedProcessBootstrapper.cs b/RedGate.AppHost.Server/RemotedProcessBootstrapper.cs
index 81c0c1c..11b5341 100644
--- a/RedGate.AppHost.Server/RemotedProcessBootstrapper.cs
+++ b/RedGate.AppHost.Server/RemotedProcessBootstrapper.cs
@@ -7,7 +7,7 @@ namespace RedGate.AppHost.Server
     internal class RemotedProcessBootstrapper
     {
         private readonly IProcessStartOperation m_ProcessBootstrapper;
-        private readonly string m_RemotingId = string.Format("RedGate.AppHost.IPC.{{{0}}}", Guid.NewGuid());
+        private readonly string m_RemotingId = $"RedGate.AppHost.IPC.{{{Guid.NewGuid()}}}";
 
         public RemotedProcessBootstrapper(IProcessStartOperation processBootstrapper)
         {
@@ -27,8 +27,7 @@ public IChildProcessHandle Create(string assemblyName, bool openDebugConsole, bo
             }
             catch
             {
-                if (process != null)
-                    process.KillAndDispose();
+                process?.KillAndDispose();
 
                 throw;
             }