diff --git a/Samples/File stream sample/FileStreamClient/FileStreamClient.csproj b/Samples/File stream sample/FileStreamClient/FileStreamClient.csproj
index b2b9970..dfc170b 100644
--- a/Samples/File stream sample/FileStreamClient/FileStreamClient.csproj	
+++ b/Samples/File stream sample/FileStreamClient/FileStreamClient.csproj	
@@ -23,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -32,6 +33,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -72,8 +74,8 @@
       <Project>{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}</Project>
       <Name>Lidgren.Network</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\SamplesCommon\SamplesCommon\SamplesCommon.csproj">
-      <Project>{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}</Project>
+    <ProjectReference Include="..\..\SamplesCommon\SamplesCommon.csproj">
+      <Project>{773069DA-B66E-4667-ADCB-0D215AD8CF3E}</Project>
       <Name>SamplesCommon</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/Samples/File stream sample/FileStreamSample.sln b/Samples/File stream sample/FileStreamSample.sln
index a42f61f..20472ef 100644
--- a/Samples/File stream sample/FileStreamSample.sln	
+++ b/Samples/File stream sample/FileStreamSample.sln	
@@ -1,36 +1,64 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileStreamServer", "FileStreamServer\FileStreamServer.csproj", "{0DB2F69A-5B5E-4CC4-9D31-C34BF86B2508}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network", "..\..\Lidgren.Network\Lidgren.Network.csproj", "{AE483C29-042E-4226-BA52-D247CE7676DA}"
-EndProject
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SamplesCommon", "..\SamplesCommon\SamplesCommon.csproj", "{773069DA-B66E-4667-ADCB-0D215AD8CF3E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileStreamClient", "FileStreamClient\FileStreamClient.csproj", "{5BEF5715-8B73-4A33-BE99-1B8B20542847}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network", "..\..\Lidgren.Network\Lidgren.Network.csproj", "{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileStreamClient", "FileStreamClient\FileStreamClient.csproj", "{386C4770-EE82-4EC6-ABDA-D8F298146E85}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileStreamServer", "FileStreamServer\FileStreamServer.csproj", "{CBE7FC2B-BC28-4361-B8F0-62493B82C8E1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0DB2F69A-5B5E-4CC4-9D31-C34BF86B2508}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DB2F69A-5B5E-4CC4-9D31-C34BF86B2508}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DB2F69A-5B5E-4CC4-9D31-C34BF86B2508}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0DB2F69A-5B5E-4CC4-9D31-C34BF86B2508}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BEF5715-8B73-4A33-BE99-1B8B20542847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BEF5715-8B73-4A33-BE99-1B8B20542847}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BEF5715-8B73-4A33-BE99-1B8B20542847}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BEF5715-8B73-4A33-BE99-1B8B20542847}.Release|Any CPU.Build.0 = Release|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|x86.ActiveCfg = Release|Any CPU
+		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Release|x86.ActiveCfg = Release|Any CPU
+		{386C4770-EE82-4EC6-ABDA-D8F298146E85}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{386C4770-EE82-4EC6-ABDA-D8F298146E85}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{386C4770-EE82-4EC6-ABDA-D8F298146E85}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{386C4770-EE82-4EC6-ABDA-D8F298146E85}.Debug|x86.ActiveCfg = Debug|x86
+		{386C4770-EE82-4EC6-ABDA-D8F298146E85}.Debug|x86.Build.0 = Debug|x86
+		{386C4770-EE82-4EC6-ABDA-D8F298146E85}.Release|Any CPU.ActiveCfg = Release|x86
+		{386C4770-EE82-4EC6-ABDA-D8F298146E85}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{386C4770-EE82-4EC6-ABDA-D8F298146E85}.Release|Mixed Platforms.Build.0 = Release|x86
+		{386C4770-EE82-4EC6-ABDA-D8F298146E85}.Release|x86.ActiveCfg = Release|x86
+		{386C4770-EE82-4EC6-ABDA-D8F298146E85}.Release|x86.Build.0 = Release|x86
+		{CBE7FC2B-BC28-4361-B8F0-62493B82C8E1}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{CBE7FC2B-BC28-4361-B8F0-62493B82C8E1}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{CBE7FC2B-BC28-4361-B8F0-62493B82C8E1}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{CBE7FC2B-BC28-4361-B8F0-62493B82C8E1}.Debug|x86.ActiveCfg = Debug|x86
+		{CBE7FC2B-BC28-4361-B8F0-62493B82C8E1}.Debug|x86.Build.0 = Debug|x86
+		{CBE7FC2B-BC28-4361-B8F0-62493B82C8E1}.Release|Any CPU.ActiveCfg = Release|x86
+		{CBE7FC2B-BC28-4361-B8F0-62493B82C8E1}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{CBE7FC2B-BC28-4361-B8F0-62493B82C8E1}.Release|Mixed Platforms.Build.0 = Release|x86
+		{CBE7FC2B-BC28-4361-B8F0-62493B82C8E1}.Release|x86.ActiveCfg = Release|x86
+		{CBE7FC2B-BC28-4361-B8F0-62493B82C8E1}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Samples/File stream sample/FileStreamServer/FileStreamServer.csproj b/Samples/File stream sample/FileStreamServer/FileStreamServer.csproj
index bf6e825..dc0fd26 100644
--- a/Samples/File stream sample/FileStreamServer/FileStreamServer.csproj	
+++ b/Samples/File stream sample/FileStreamServer/FileStreamServer.csproj	
@@ -23,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -32,6 +33,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -73,8 +75,8 @@
       <Project>{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}</Project>
       <Name>Lidgren.Network</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\SamplesCommon\SamplesCommon\SamplesCommon.csproj">
-      <Project>{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}</Project>
+    <ProjectReference Include="..\..\SamplesCommon\SamplesCommon.csproj">
+      <Project>{773069DA-B66E-4667-ADCB-0D215AD8CF3E}</Project>
       <Name>SamplesCommon</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/Samples/ImageSample/ImageClient/ImageClient.csproj b/Samples/ImageSample/ImageClient/ImageClient.csproj
index f5567e2..7bf8d32 100644
--- a/Samples/ImageSample/ImageClient/ImageClient.csproj
+++ b/Samples/ImageSample/ImageClient/ImageClient.csproj
@@ -81,6 +81,10 @@
       <Project>{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}</Project>
       <Name>Lidgren.Network</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\SamplesCommon\SamplesCommon.csproj">
+      <Project>{773069DA-B66E-4667-ADCB-0D215AD8CF3E}</Project>
+      <Name>SamplesCommon</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Samples/ImageSample/ImageServer/ImageServer.csproj b/Samples/ImageSample/ImageServer/ImageServer.csproj
index 4b10bb6..d32a701 100644
--- a/Samples/ImageSample/ImageServer/ImageServer.csproj
+++ b/Samples/ImageSample/ImageServer/ImageServer.csproj
@@ -72,6 +72,10 @@
       <Project>{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}</Project>
       <Name>Lidgren.Network</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\SamplesCommon\SamplesCommon.csproj">
+      <Project>{773069DA-B66E-4667-ADCB-0D215AD8CF3E}</Project>
+      <Name>SamplesCommon</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Samples/LibraryTestSamples/ManySample/ManyClients/ManyClients.csproj b/Samples/LibraryTestSamples/ManySample/ManyClients/ManyClients.csproj
index 335be84..da0975e 100644
--- a/Samples/LibraryTestSamples/ManySample/ManyClients/ManyClients.csproj
+++ b/Samples/LibraryTestSamples/ManySample/ManyClients/ManyClients.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,8 +10,29 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ManyClients</RootNamespace>
     <AssemblyName>ManyClients</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkProfile>Client</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>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -21,6 +42,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +51,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -71,7 +94,9 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="app.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -84,7 +109,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Lidgren.Network\Lidgren.Network.csproj">
-      <Project>{AE483C29-042E-4226-BA52-D247CE7676DA}</Project>
+      <Project>{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}</Project>
       <Name>Lidgren.Network</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\SamplesCommon\SamplesCommon.csproj">
@@ -92,6 +117,23 @@
       <Name>SamplesCommon</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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/Samples/LibraryTestSamples/ManySample/ManyClients/Properties/Resources.Designer.cs b/Samples/LibraryTestSamples/ManySample/ManyClients/Properties/Resources.Designer.cs
index 1dd11cf..9e7bfd6 100644
--- a/Samples/LibraryTestSamples/ManySample/ManyClients/Properties/Resources.Designer.cs
+++ b/Samples/LibraryTestSamples/ManySample/ManyClients/Properties/Resources.Designer.cs
@@ -1,71 +1,63 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
+//     Runtime Version:4.0.30319.544
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace ManyClients.Properties
-{
-
-
-	/// <summary>
-	///   A strongly-typed resource class, for looking up localized strings, etc.
-	/// </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.
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
-	[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-	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()
-		{
-		}
-
-		/// <summary>
-		///   Returns the cached ResourceManager instance used by this class.
-		/// </summary>
-		[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-		internal static global::System.Resources.ResourceManager ResourceManager
-		{
-			get
-			{
-				if ((resourceMan == null))
-				{
-					global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ManyClients.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.
-		/// </summary>
-		[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-		internal static global::System.Globalization.CultureInfo Culture
-		{
-			get
-			{
-				return resourceCulture;
-			}
-			set
-			{
-				resourceCulture = value;
-			}
-		}
-	}
+namespace ManyClients.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </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.
+    [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 {
+        
+        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() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ManyClients.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.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
 }
diff --git a/Samples/LibraryTestSamples/ManySample/ManyClients/Properties/Settings.Designer.cs b/Samples/LibraryTestSamples/ManySample/ManyClients/Properties/Settings.Designer.cs
index f6c52b2..ca55608 100644
--- a/Samples/LibraryTestSamples/ManySample/ManyClients/Properties/Settings.Designer.cs
+++ b/Samples/LibraryTestSamples/ManySample/ManyClients/Properties/Settings.Designer.cs
@@ -1,30 +1,26 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
+//     Runtime Version:4.0.30319.544
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace ManyClients.Properties
-{
-
-
-	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.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
-			{
-				return defaultInstance;
-			}
-		}
-	}
+namespace ManyClients.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.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 {
+                return defaultInstance;
+            }
+        }
+    }
 }
diff --git a/Samples/LibraryTestSamples/ManySample/ManySample.sln b/Samples/LibraryTestSamples/ManySample/ManySample.sln
index a8b0010..b5af74e 100644
--- a/Samples/LibraryTestSamples/ManySample/ManySample.sln
+++ b/Samples/LibraryTestSamples/ManySample/ManySample.sln
@@ -1,14 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManyClient", "ManyClient\ManyClient.csproj", "{E8291826-5C3C-4CAD-9558-E30477F341E3}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManyServer", "ManyServer\ManyServer.csproj", "{DD2B8C4D-7375-4656-9D00-C468303C034C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SamplesCommon", "..\..\SamplesCommon\SamplesCommon\SamplesCommon.csproj", "{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network", "..\..\..\Lidgren.Network\Lidgren.Network.csproj", "{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManyClients", "ManyClients\ManyClients.csproj", "{A41772F5-F20F-408D-ABD1-5D1C144853C6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SamplesCommon", "..\..\SamplesCommon\SamplesCommon.csproj", "{773069DA-B66E-4667-ADCB-0D215AD8CF3E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -19,16 +19,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E8291826-5C3C-4CAD-9558-E30477F341E3}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{E8291826-5C3C-4CAD-9558-E30477F341E3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{E8291826-5C3C-4CAD-9558-E30477F341E3}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{E8291826-5C3C-4CAD-9558-E30477F341E3}.Debug|x86.ActiveCfg = Debug|x86
-		{E8291826-5C3C-4CAD-9558-E30477F341E3}.Debug|x86.Build.0 = Debug|x86
-		{E8291826-5C3C-4CAD-9558-E30477F341E3}.Release|Any CPU.ActiveCfg = Release|x86
-		{E8291826-5C3C-4CAD-9558-E30477F341E3}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{E8291826-5C3C-4CAD-9558-E30477F341E3}.Release|Mixed Platforms.Build.0 = Release|x86
-		{E8291826-5C3C-4CAD-9558-E30477F341E3}.Release|x86.ActiveCfg = Release|x86
-		{E8291826-5C3C-4CAD-9558-E30477F341E3}.Release|x86.Build.0 = Release|x86
 		{DD2B8C4D-7375-4656-9D00-C468303C034C}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{DD2B8C4D-7375-4656-9D00-C468303C034C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{DD2B8C4D-7375-4656-9D00-C468303C034C}.Debug|Mixed Platforms.Build.0 = Debug|x86
@@ -39,16 +29,6 @@ Global
 		{DD2B8C4D-7375-4656-9D00-C468303C034C}.Release|Mixed Platforms.Build.0 = Release|x86
 		{DD2B8C4D-7375-4656-9D00-C468303C034C}.Release|x86.ActiveCfg = Release|x86
 		{DD2B8C4D-7375-4656-9D00-C468303C034C}.Release|x86.Build.0 = Release|x86
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Release|x86.ActiveCfg = Release|Any CPU
 		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -59,6 +39,26 @@ Global
 		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Release|x86.ActiveCfg = Release|Any CPU
+		{A41772F5-F20F-408D-ABD1-5D1C144853C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A41772F5-F20F-408D-ABD1-5D1C144853C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A41772F5-F20F-408D-ABD1-5D1C144853C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A41772F5-F20F-408D-ABD1-5D1C144853C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A41772F5-F20F-408D-ABD1-5D1C144853C6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A41772F5-F20F-408D-ABD1-5D1C144853C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A41772F5-F20F-408D-ABD1-5D1C144853C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A41772F5-F20F-408D-ABD1-5D1C144853C6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A41772F5-F20F-408D-ABD1-5D1C144853C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A41772F5-F20F-408D-ABD1-5D1C144853C6}.Release|x86.ActiveCfg = Release|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Samples/LibraryTestSamples/ManySample/ManyServer/ManyServer.csproj b/Samples/LibraryTestSamples/ManySample/ManyServer/ManyServer.csproj
index 10446d8..ebcfc9a 100644
--- a/Samples/LibraryTestSamples/ManySample/ManyServer/ManyServer.csproj
+++ b/Samples/LibraryTestSamples/ManySample/ManyServer/ManyServer.csproj
@@ -72,8 +72,8 @@
       <Project>{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}</Project>
       <Name>Lidgren.Network</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\SamplesCommon\SamplesCommon\SamplesCommon.csproj">
-      <Project>{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}</Project>
+    <ProjectReference Include="..\..\..\SamplesCommon\SamplesCommon.csproj">
+      <Project>{773069DA-B66E-4667-ADCB-0D215AD8CF3E}</Project>
       <Name>SamplesCommon</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/Samples/LibraryTestSamples/SpeedSample/SpeedClient/SpeedTestClient.csproj b/Samples/LibraryTestSamples/SpeedSample/SpeedClient/SpeedTestClient.csproj
index 7ef0548..71b6fc4 100644
--- a/Samples/LibraryTestSamples/SpeedSample/SpeedClient/SpeedTestClient.csproj
+++ b/Samples/LibraryTestSamples/SpeedSample/SpeedClient/SpeedTestClient.csproj
@@ -91,7 +91,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="app.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/Samples/LibraryTestSamples/SpeedSample/SpeedServer/SpeedTestServer.csproj b/Samples/LibraryTestSamples/SpeedSample/SpeedServer/SpeedTestServer.csproj
index d62e3c0..92477a2 100644
--- a/Samples/LibraryTestSamples/SpeedSample/SpeedServer/SpeedTestServer.csproj
+++ b/Samples/LibraryTestSamples/SpeedSample/SpeedServer/SpeedTestServer.csproj
@@ -93,7 +93,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="app.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/Samples/LibraryTestSamples/UnconnectedSample/UnconnectedSample.sln b/Samples/LibraryTestSamples/UnconnectedSample/UnconnectedSample.sln
index 8e143a1..feabf9c 100644
--- a/Samples/LibraryTestSamples/UnconnectedSample/UnconnectedSample.sln
+++ b/Samples/LibraryTestSamples/UnconnectedSample/UnconnectedSample.sln
@@ -3,10 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnconnectedSample", "UnconnectedSample\UnconnectedSample.csproj", "{2DDC8594-8947-4BAC-950E-DB899AC354DD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SamplesCommon", "..\..\SamplesCommon\SamplesCommon\SamplesCommon.csproj", "{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network", "..\..\..\Lidgren.Network\Lidgren.Network.csproj", "{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SamplesCommon", "..\..\SamplesCommon\SamplesCommon.csproj", "{773069DA-B66E-4667-ADCB-0D215AD8CF3E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,16 +27,6 @@ Global
 		{2DDC8594-8947-4BAC-950E-DB899AC354DD}.Release|Mixed Platforms.Build.0 = Release|x86
 		{2DDC8594-8947-4BAC-950E-DB899AC354DD}.Release|x86.ActiveCfg = Release|x86
 		{2DDC8594-8947-4BAC-950E-DB899AC354DD}.Release|x86.Build.0 = Release|x86
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}.Release|x86.ActiveCfg = Release|Any CPU
 		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -47,6 +37,16 @@ Global
 		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Release|x86.ActiveCfg = Release|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Samples/LibraryTestSamples/UnconnectedSample/UnconnectedSample/UnconnectedSample.csproj b/Samples/LibraryTestSamples/UnconnectedSample/UnconnectedSample/UnconnectedSample.csproj
index 9eacc5f..68c2f3b 100644
--- a/Samples/LibraryTestSamples/UnconnectedSample/UnconnectedSample/UnconnectedSample.csproj
+++ b/Samples/LibraryTestSamples/UnconnectedSample/UnconnectedSample/UnconnectedSample.csproj
@@ -72,8 +72,8 @@
       <Project>{49BA1C69-6104-41AC-A5D8-B54FA9F696E8}</Project>
       <Name>Lidgren.Network</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\SamplesCommon\SamplesCommon\SamplesCommon.csproj">
-      <Project>{64D2482A-3C16-4D1F-A3F6-058FC3D73E21}</Project>
+    <ProjectReference Include="..\..\..\SamplesCommon\SamplesCommon.csproj">
+      <Project>{773069DA-B66E-4667-ADCB-0D215AD8CF3E}</Project>
       <Name>SamplesCommon</Name>
     </ProjectReference>
   </ItemGroup>