diff --git a/Net/Net_CE_vs90.vcproj b/Net/Net_CE_vs90.vcproj
index 543e54eb1..d4ef95bcd 100644
--- a/Net/Net_CE_vs90.vcproj
+++ b/Net/Net_CE_vs90.vcproj
@@ -904,6 +904,27 @@
 					RelativePath=".\src\ICMPv4PacketImpl.cpp"/>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="NTP">
+			<Filter
+				Name="Header Files">
+				<File
+					RelativePath=".\include\Poco\Net\NTPClient.h"/>
+				<File
+					RelativePath=".\include\Poco\Net\NTPEventArgs.h"/>
+				<File
+					RelativePath=".\include\Poco\Net\NTPPacket.h"/>
+			</Filter>
+			<Filter
+				Name="Source Files">
+				<File
+					RelativePath=".\src\NTPClient.cpp"/>
+				<File
+					RelativePath=".\src\NTPEventArgs.cpp"/>
+				<File
+					RelativePath=".\src\NTPPacket.cpp"/>
+			</Filter>
+		</Filter>
 		<Filter
 			Name="Logging">
 			<Filter
diff --git a/Net/Net_vs100.vcxproj.filters b/Net/Net_vs100.vcxproj.filters
index 5c98001bc..7c81e77b5 100644
--- a/Net/Net_vs100.vcxproj.filters
+++ b/Net/Net_vs100.vcxproj.filters
@@ -2,139 +2,139 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{bf93ac22-b1ed-45b0-b1ad-6e5c45dd357b}</UniqueIdentifier>
+      <UniqueIdentifier>{62e5a07d-f3af-4e24-8fec-dca986fc09bd}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{13e6bafa-9776-4d40-aef0-afbaab425acd}</UniqueIdentifier>
+      <UniqueIdentifier>{3c46de66-c6a3-4d42-831b-3698671c8b90}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{e5fe6a3d-b398-4c9a-9a9b-0e7974aa2c67}</UniqueIdentifier>
+      <UniqueIdentifier>{0c212881-d9a5-44fa-9bc0-4884d0b2eeb3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{17cec3ce-58b8-4f3b-80fd-278549e9f0ef}</UniqueIdentifier>
+      <UniqueIdentifier>{03f4a8a5-c647-452d-acf2-f25d91c50651}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{883506bd-9f38-4a21-a0d9-e9fbd2f48109}</UniqueIdentifier>
+      <UniqueIdentifier>{0d535117-01df-424f-81c1-647eb3db992f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{906cc65b-a424-4e23-8bef-bd0692b53c0a}</UniqueIdentifier>
+      <UniqueIdentifier>{4740b04d-533a-45f5-81a6-d929cba1eba0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{8b41a70d-665b-469c-b594-a2e0fd1dec83}</UniqueIdentifier>
+      <UniqueIdentifier>{9e7222ba-16a4-49f7-b1f6-e363a0e8da9b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{85820bf0-24cd-41fd-b2da-30468b93ff80}</UniqueIdentifier>
+      <UniqueIdentifier>{8cb5954d-108e-4f2b-9d26-22edc1304735}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{33d34ed1-97f1-4935-92bf-923eaddf3865}</UniqueIdentifier>
+      <UniqueIdentifier>{78e9eb48-9455-4e0d-bf7f-3283b41109ce}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{1433c088-0942-470a-a5f2-c1d5c98dbccd}</UniqueIdentifier>
+      <UniqueIdentifier>{a450c784-514d-4da4-892c-a379c8105d5a}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{ade366b2-74a8-440b-90a7-cf3f622bfb0f}</UniqueIdentifier>
+      <UniqueIdentifier>{46a0ac23-fe38-4bb7-a6e3-62a253643eeb}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{83f28ae0-7192-4353-b46c-4db7a39c42a6}</UniqueIdentifier>
+      <UniqueIdentifier>{a48f6855-234b-4016-b690-9e423579c2a3}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{1313e814-7e84-4182-9fa0-8a65b0d3886e}</UniqueIdentifier>
+      <UniqueIdentifier>{5a046bb9-a20e-492e-8f51-928644794e78}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{a589d672-41af-4a2b-9e46-568cec5c06ab}</UniqueIdentifier>
+      <UniqueIdentifier>{4dd6068d-4991-461e-9cd0-b2c38418edcd}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{6af0df92-a0b0-4b51-95de-4d889bf18899}</UniqueIdentifier>
+      <UniqueIdentifier>{94904f1a-33c3-43d3-a115-7b9ec6fe3ec4}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{af6c5d6a-a250-4b51-97e2-bc592c700b9e}</UniqueIdentifier>
+      <UniqueIdentifier>{ef4bcacb-0c61-48ac-81ee-acef61f9bccd}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{e67db7fb-6a04-4c39-97d3-3d5a6a83cdd5}</UniqueIdentifier>
+      <UniqueIdentifier>{6f214066-1071-4b61-bf70-008d9ba4606a}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{5b06e1c5-1100-43de-a9c4-54dfd7c0fce9}</UniqueIdentifier>
+      <UniqueIdentifier>{5aaedb54-a4e1-4f6c-bd97-205509f26bc9}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{8939f790-51f1-4953-9b27-472fb47d1659}</UniqueIdentifier>
+      <UniqueIdentifier>{075a6157-1b80-4277-bcec-834ae3ffe9d8}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{3e779fb0-e41b-4fc0-9304-462d8019aaf8}</UniqueIdentifier>
+      <UniqueIdentifier>{46b20366-f111-4155-a3bf-a4486ff93d48}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{671ad416-a0f4-48e0-a71a-733bf3675bf8}</UniqueIdentifier>
+      <UniqueIdentifier>{537b15e2-e91a-4099-a54a-31f93c62ff4f}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{18b73242-192b-4860-897e-56cd81e84ea1}</UniqueIdentifier>
+      <UniqueIdentifier>{e3fb77b3-3ab9-4e41-9ea6-07f9620fe765}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{b29abaef-8b6b-4a92-bf7a-a0aea7f11dcb}</UniqueIdentifier>
+      <UniqueIdentifier>{af13ed34-37a7-4993-b112-92757cd7ba13}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{a3513b74-30be-444f-95d1-6fdf24f6d1e4}</UniqueIdentifier>
+      <UniqueIdentifier>{2993c88f-8637-40a6-b388-1d531b75a9a4}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{e97df5ae-1adb-4646-9bd3-250829068321}</UniqueIdentifier>
+      <UniqueIdentifier>{1cf7c649-210d-4cec-aa4e-b23a0f803d4f}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{b6b83878-3308-46c7-9972-26520ca304fd}</UniqueIdentifier>
+      <UniqueIdentifier>{4fed6c1d-9b7c-4bb7-8ed1-5de2fe602427}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{2433021f-2ab9-4261-8f3a-6d023ba160d1}</UniqueIdentifier>
+      <UniqueIdentifier>{da489162-6c1d-49d5-921e-ffa611a2f8d9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{70a6eafd-56f9-4773-8e4f-87e5d2175d7c}</UniqueIdentifier>
+      <UniqueIdentifier>{93abb1ce-26be-463f-9df7-8ac601619e76}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{9a7ce52d-d095-4559-8436-7de95e971afb}</UniqueIdentifier>
+      <UniqueIdentifier>{aba6b1fb-f05f-4214-b570-6c8b8d6373a5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{da3dc270-121d-48b9-9ca8-3e513d0f9239}</UniqueIdentifier>
+      <UniqueIdentifier>{f7c0b49e-8236-4c2e-9dd0-a8de25b41605}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{b8704ed1-e104-4a4b-8109-0e29edd7bb66}</UniqueIdentifier>
+      <UniqueIdentifier>{8b17f4e1-31ce-4b6d-95af-01c3002775ff}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{1a0cc176-9c59-43d3-82e1-23f45f7fce68}</UniqueIdentifier>
+      <UniqueIdentifier>{6f1cd6e9-e2b5-4f16-8dd6-239dba75bc12}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{91e5e9c2-d7ec-43ce-8aec-66c543a11955}</UniqueIdentifier>
+      <UniqueIdentifier>{5f49e6a4-8f55-4a6e-befa-0ce2b8a31f0b}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{3e294831-7b07-47d1-842d-570496a6d952}</UniqueIdentifier>
+      <UniqueIdentifier>{10b77e0f-a28a-4c46-bba1-b85e4a2985fe}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{3638e5e7-1a9e-4e8b-b592-d1b62c141ec7}</UniqueIdentifier>
+      <UniqueIdentifier>{de655568-e844-4c00-8482-ce100286d7d8}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{2ce82646-f2ab-4e38-8713-79cd35e42530}</UniqueIdentifier>
+      <UniqueIdentifier>{7130fac4-5a8c-4830-ae22-25127305416e}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{f3d85145-90c3-4a17-8562-be316bf20a1d}</UniqueIdentifier>
+      <UniqueIdentifier>{3e98f646-f7ad-4476-a5ba-c6aa413f9a5a}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{52ea85f6-a62a-4fe2-a402-c0f9a5fa450b}</UniqueIdentifier>
+      <UniqueIdentifier>{c2bdc58b-fb20-4a40-8a86-891188afdfb7}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{182f7431-8d75-4743-95e1-97b299d06f3d}</UniqueIdentifier>
+      <UniqueIdentifier>{2834acd4-d47f-4158-9d64-75bf34169c2d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{48534ce3-5ed5-407b-b2c6-ebdfdc546dbc}</UniqueIdentifier>
+      <UniqueIdentifier>{2ce8920c-a41d-4bf8-b301-7908abb40a81}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{4740c6cf-e0ca-4965-bcc6-42c0b529dd0e}</UniqueIdentifier>
+      <UniqueIdentifier>{1df8d2a5-adac-4d27-9c3f-3dd795eb4af1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{d1b42d09-3e9a-4297-8887-e93c1f32875c}</UniqueIdentifier>
+      <UniqueIdentifier>{09f5e33b-8761-47c9-b9a4-b4ac1f7aecdc}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{01029c33-8806-433a-a26e-5f9c5cb105ed}</UniqueIdentifier>
+      <UniqueIdentifier>{7eb4db21-44a2-4589-ae96-a455a88695e8}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{7845d469-a70e-40e0-81f3-6cab58acca9f}</UniqueIdentifier>
+      <UniqueIdentifier>{1dc4de5d-e2ab-4a2c-993c-1bbc67a25ea1}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{f914c395-d3b5-4373-a26b-4c6f73ac0d96}</UniqueIdentifier>
+      <UniqueIdentifier>{2115c418-157f-403e-ac77-265b455a71d7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/Net/Net_vs110.vcxproj b/Net/Net_vs110.vcxproj
index 5a05baf50..ef50c33ff 100644
--- a/Net/Net_vs110.vcxproj
+++ b/Net/Net_vs110.vcxproj
@@ -85,7 +85,21 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">..\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">..\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoNetd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoNetmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoNetmtd</TargetName>
@@ -93,32 +107,6 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoNetmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoNetmt</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
-    <OutDir>..\bin\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
-    <OutDir>..\bin\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
-    <OutDir>..\lib\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
-    <OutDir>..\lib\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
-    <OutDir>..\lib\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
-    <OutDir>..\lib\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -136,6 +124,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -168,6 +157,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -200,6 +190,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\PocoNetmtd.lib</OutputFile>
@@ -224,6 +215,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\PocoNetmt.lib</OutputFile>
@@ -247,6 +239,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\PocoNetmdd.lib</OutputFile>
@@ -272,6 +265,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/Net/Net_vs110.vcxproj.filters b/Net/Net_vs110.vcxproj.filters
index 3921552ed..656a1104b 100644
--- a/Net/Net_vs110.vcxproj.filters
+++ b/Net/Net_vs110.vcxproj.filters
@@ -2,139 +2,139 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{b12d7ec2-1093-4e9c-8906-70bad655464f}</UniqueIdentifier>
+      <UniqueIdentifier>{4e89643b-2672-49f5-8250-feb284a94a35}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{9a78119d-4efb-484a-9429-31cdc099264d}</UniqueIdentifier>
+      <UniqueIdentifier>{52981788-eb21-41ca-81e3-99f88f0764b9}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{799e8f86-ed35-4909-ac87-fafe2c551df1}</UniqueIdentifier>
+      <UniqueIdentifier>{cf4b21bd-45f8-43be-991f-5ee7da1c3fed}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{0f9b239e-bb53-44a0-b936-2d7ebad7bed8}</UniqueIdentifier>
+      <UniqueIdentifier>{1063cad8-a367-4841-a5b7-cc290a8a98e6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{0e6d492a-b0ec-4c71-bb1c-a2dacefb3126}</UniqueIdentifier>
+      <UniqueIdentifier>{818d7eeb-2d85-4439-9bc5-f79c77a7534f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{9987986f-c3d0-4242-aa15-2a6309ed0821}</UniqueIdentifier>
+      <UniqueIdentifier>{47381e87-c68a-46c0-86fd-6139973163ec}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{aa4b8e2e-a5f6-4eea-90f1-8d82be298824}</UniqueIdentifier>
+      <UniqueIdentifier>{656e57df-9820-4267-b9cd-25009a01bd87}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{c27d8619-524e-4777-bb65-1a7f88b49cb7}</UniqueIdentifier>
+      <UniqueIdentifier>{773d70a7-4db8-4815-8b60-48b7ad1e90d2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{632ded72-a1f9-4b1f-ba56-0edc2001b4f8}</UniqueIdentifier>
+      <UniqueIdentifier>{8a39a33d-7229-4709-8ae1-3f68b4c09003}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{ab948413-c58e-4b37-84c2-f7478bf7d9e3}</UniqueIdentifier>
+      <UniqueIdentifier>{d61df559-64f0-4653-a6fa-71521a7b4f50}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{c5a7e7db-2211-43ee-a624-66a55520581e}</UniqueIdentifier>
+      <UniqueIdentifier>{8fadc164-97d3-46e2-bf94-c3f9de05dcfc}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{ceb26577-00a4-409e-a51b-7a4e8008f28b}</UniqueIdentifier>
+      <UniqueIdentifier>{ce5e51b7-2e03-4702-ac28-7a5efbb53497}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{98e5ef2c-f449-4fb5-8477-bd653536ef6b}</UniqueIdentifier>
+      <UniqueIdentifier>{6ffc7661-60b8-4adb-97bd-66d6767cc9ca}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{d2396321-d74f-4d30-a7e1-1e2d30a26940}</UniqueIdentifier>
+      <UniqueIdentifier>{938b2e38-7d44-4f7b-955b-8fdebf714066}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{a51057ae-c932-4553-a622-9c463fb6a503}</UniqueIdentifier>
+      <UniqueIdentifier>{970b13c6-1110-482b-be08-c17147fd35fb}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{775adef8-b3f9-4edf-b1d4-70952dbf0c9a}</UniqueIdentifier>
+      <UniqueIdentifier>{e84d03a0-ad24-48f2-9ecf-53b55d56abb1}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{31788d1c-d581-4755-b604-11588b8749d8}</UniqueIdentifier>
+      <UniqueIdentifier>{d6c8dfc0-c668-4ee4-9cb6-02a6e0bc4380}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{74ec7f29-4e6c-4d2b-a028-d50c3af007e3}</UniqueIdentifier>
+      <UniqueIdentifier>{537a8942-970e-48ab-8802-792d845ecc70}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{04c2ece0-9f32-473f-96eb-092b7bc6f693}</UniqueIdentifier>
+      <UniqueIdentifier>{c9468565-ca0c-4904-b09a-424b0244ac50}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{8eb0477b-0aa0-43a7-8db2-f56cf22ad8ca}</UniqueIdentifier>
+      <UniqueIdentifier>{a946e07c-8da6-4071-aad7-14dc1163ba29}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{834ca5e7-486d-4a1b-b729-b497b0a7fef7}</UniqueIdentifier>
+      <UniqueIdentifier>{51c4d0f2-4c29-4680-955d-eb4b3b279815}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{9697ec4e-ceb2-49c6-985f-c04272c0cb7f}</UniqueIdentifier>
+      <UniqueIdentifier>{9924cb81-1e2e-45bf-aed5-d2e125a9606b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{1646e2dd-04a4-4f07-b4f0-1d3baeaa6926}</UniqueIdentifier>
+      <UniqueIdentifier>{7cd4fb8d-a177-45bf-8458-314e98e82d8a}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{63b09b8c-a34e-4b43-bbfb-c5a740fb6bd5}</UniqueIdentifier>
+      <UniqueIdentifier>{2d8da8ef-076c-4e2e-b252-932ceec924ac}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{079fd901-385b-4e3c-aedd-8bcbeb0c2e24}</UniqueIdentifier>
+      <UniqueIdentifier>{fcd3b95b-ad16-4a96-8856-5ef6fc93eb31}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{3ebb62af-b1cb-4ef1-9f49-b2c26ab43eba}</UniqueIdentifier>
+      <UniqueIdentifier>{79f3e508-af2a-43de-9d18-4d0a1852e001}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{a084bbb3-a4c7-442f-9dbe-31135fa1503b}</UniqueIdentifier>
+      <UniqueIdentifier>{d4014c08-0dea-4595-917a-8073a59e454e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{646da178-8728-4867-9085-88050223c5c6}</UniqueIdentifier>
+      <UniqueIdentifier>{56e67538-8efc-44c4-bb7c-08c82f8ccd9c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{ec93ff0e-f854-48e4-bd3c-aa25437fb28f}</UniqueIdentifier>
+      <UniqueIdentifier>{0b761de4-0c9c-41bb-a2c9-175da91b22da}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{f73e3a47-6100-4b79-bd28-5d6eb1ff3329}</UniqueIdentifier>
+      <UniqueIdentifier>{3d7ba788-c0ef-4cd7-9204-89a3b12b37b5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{73dfa3f3-6a27-4fa7-af7f-628ebf154086}</UniqueIdentifier>
+      <UniqueIdentifier>{e0e6f8e5-1cd3-4bdc-b714-97a90f756d31}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{d2480f81-64d6-4e67-b626-119f6611b627}</UniqueIdentifier>
+      <UniqueIdentifier>{cab7ece6-e461-4a95-9460-c56465bcd11e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{bdd8ba6f-5b59-4ccb-9dae-96de0f0f9186}</UniqueIdentifier>
+      <UniqueIdentifier>{7d8e6376-4b14-4334-81a6-04ba48fddba3}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{7bd431a6-eb3a-4e10-9aa3-7cbfb8d6d042}</UniqueIdentifier>
+      <UniqueIdentifier>{1d006f90-0950-4968-98c9-3b471c5029d4}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{d6306ebe-ce12-4860-b4e3-c13d83899b9f}</UniqueIdentifier>
+      <UniqueIdentifier>{c4848ab7-de1e-41c1-8d51-9ab8416f58e2}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{d5ef0627-2c3a-4769-8d3e-81e90817a55f}</UniqueIdentifier>
+      <UniqueIdentifier>{bd4ff7ca-42c5-4339-a4bd-957bfa67e424}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{ec6d0d27-ba9b-4aaf-ac8f-bb2932e0810a}</UniqueIdentifier>
+      <UniqueIdentifier>{29e189e5-08fd-40cf-88c5-f8a66a40f696}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{8534ac9e-2d9c-4c44-89b6-c525221a07c6}</UniqueIdentifier>
+      <UniqueIdentifier>{d3629cb1-be06-435f-80fe-0f7879743d60}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{38cb9773-1ca1-4a20-b3c5-b7feeb9eb170}</UniqueIdentifier>
+      <UniqueIdentifier>{10c39c0b-b92b-497b-8366-bef1ed0cd990}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{7bc7d911-6f05-4573-9f70-e07fda36405d}</UniqueIdentifier>
+      <UniqueIdentifier>{5f91810e-1e83-44d2-a0a6-c179dc3a0c6b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{eb2d39d3-b631-4b89-b203-fcf778b92388}</UniqueIdentifier>
+      <UniqueIdentifier>{c31e254f-9edf-4f60-9d0b-71a31cfd5f50}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{d2b52d30-03d8-4a6a-a6e2-232458c39fbf}</UniqueIdentifier>
+      <UniqueIdentifier>{1ae0891e-cb65-4762-bbde-8ea02d74760a}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{79b6fb46-c7b8-46a9-940c-f5ca2a9508b6}</UniqueIdentifier>
+      <UniqueIdentifier>{377b09d2-8d40-4d24-a20d-5ded831c95bb}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{7c6ba88f-9e65-4613-9472-9527379610bb}</UniqueIdentifier>
+      <UniqueIdentifier>{cc03941d-351d-4744-9dc3-bba02d1c4a7a}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{928ec224-7371-410e-a9e7-3c7fadea1e9d}</UniqueIdentifier>
+      <UniqueIdentifier>{c536043b-50d0-4a5d-bd75-2b56bb053df5}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/Net/Net_vs120.vcxproj b/Net/Net_vs120.vcxproj
index 483f764c8..147ab4253 100644
--- a/Net/Net_vs120.vcxproj
+++ b/Net/Net_vs120.vcxproj
@@ -85,7 +85,21 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">..\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">..\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">..\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoNetd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoNetmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoNetmtd</TargetName>
@@ -93,32 +107,6 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoNetmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoNetmt</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
-    <OutDir>..\bin\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
-    <OutDir>..\bin\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
-    <OutDir>..\lib\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
-    <OutDir>..\lib\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
-    <OutDir>..\lib\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
-    <OutDir>..\lib\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -136,6 +124,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -168,6 +157,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -200,6 +190,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\PocoNetmtd.lib</OutputFile>
@@ -224,6 +215,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\PocoNetmt.lib</OutputFile>
@@ -247,6 +239,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\PocoNetmdd.lib</OutputFile>
@@ -272,6 +265,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/Net/Net_vs120.vcxproj.filters b/Net/Net_vs120.vcxproj.filters
index d417a2307..1b32395f8 100644
--- a/Net/Net_vs120.vcxproj.filters
+++ b/Net/Net_vs120.vcxproj.filters
@@ -2,139 +2,139 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{ff5582f7-c508-4365-8f37-67be6af2be6f}</UniqueIdentifier>
+      <UniqueIdentifier>{49a9edde-ef50-46c3-beeb-c47141e40897}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{0e03a507-77f8-4f77-a539-cd1731c4c298}</UniqueIdentifier>
+      <UniqueIdentifier>{6d5a63b0-66de-4124-9e46-f4c25f6b751e}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{383e9176-fe8d-4633-b2d2-cb5a6bb03bf5}</UniqueIdentifier>
+      <UniqueIdentifier>{e88e49fa-f593-4b5a-8338-12cc482a7137}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{b59af455-f5ec-44d7-9d60-3b9ae519e666}</UniqueIdentifier>
+      <UniqueIdentifier>{abbec8a8-8866-470b-8995-5a7d94f8105d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{f0f2291c-1d55-4ec1-9ecd-f6b2f805888c}</UniqueIdentifier>
+      <UniqueIdentifier>{4d2f7bd5-453a-41e2-9b29-eb2f310f6bd0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{ef83b525-5fd3-4fd1-90ad-79926a03d4a8}</UniqueIdentifier>
+      <UniqueIdentifier>{09060853-322b-40b7-aa75-d0b46839b8c6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{c186f713-dbcd-4c3c-bb55-0190f8315aed}</UniqueIdentifier>
+      <UniqueIdentifier>{ca2e16ee-251d-4148-9a20-7146d59c17df}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{fffdc611-4ea7-4327-8726-206dd34dda65}</UniqueIdentifier>
+      <UniqueIdentifier>{d1eb65a7-7775-49e7-9e2a-abf2cadb9ee9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{f6c04114-8f0f-44d9-8b4e-36b4180891f4}</UniqueIdentifier>
+      <UniqueIdentifier>{d52ee9a1-70a5-4246-a2f6-c648d855a658}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{219fd87c-90d4-438c-aca9-a7c2e9b864cf}</UniqueIdentifier>
+      <UniqueIdentifier>{41c45da6-8faf-4116-9d9e-27e5bce43a5b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{42f64970-2178-4486-bd08-a7559af2c471}</UniqueIdentifier>
+      <UniqueIdentifier>{bdcdfef8-09f1-4815-bafc-edd90da1f4ad}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{07d2d40e-640b-48cc-9a6c-aa68469f36e4}</UniqueIdentifier>
+      <UniqueIdentifier>{d753e22d-dc58-4cf0-a557-4a77fe451b23}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{e4bae9b2-192c-4107-86b8-56efb6db46bd}</UniqueIdentifier>
+      <UniqueIdentifier>{d35dbcef-b006-4909-aa79-e5c7d47d13ee}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{bd8b6f2d-d05d-4c78-a386-8ec911bac675}</UniqueIdentifier>
+      <UniqueIdentifier>{6e2b9a6f-baf8-4488-8c01-b60e67137e78}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{b648fb3c-f134-4327-88ed-a8d755c131f5}</UniqueIdentifier>
+      <UniqueIdentifier>{ec64c190-468c-417a-9488-600d680b76e4}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{e81b06d1-da9b-4d29-b1f3-a84cb877dc8c}</UniqueIdentifier>
+      <UniqueIdentifier>{35c3fa21-3172-4f35-8063-6f879ba38d40}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{718b66c9-316e-4561-8edb-0a94e089e6f2}</UniqueIdentifier>
+      <UniqueIdentifier>{b56c4541-3b36-4994-bb43-e6e1de6264f8}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{6aeffea2-550f-478f-91c3-3c977ee5a0f2}</UniqueIdentifier>
+      <UniqueIdentifier>{53fc4fa6-7126-4c74-ac8d-ea2dea477b9e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{adba4a95-88c4-492a-9f56-a0a9a3658dc1}</UniqueIdentifier>
+      <UniqueIdentifier>{9e6b6b83-7cd1-432a-a44d-4eeb504e15e2}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{a748edf5-e6b0-4a1a-917e-34e1faf4d658}</UniqueIdentifier>
+      <UniqueIdentifier>{fa073f7a-054b-44ab-bcb4-741882edd00c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{c021ccc1-2e80-4f5b-b3d4-b3bb3948a910}</UniqueIdentifier>
+      <UniqueIdentifier>{7d4cde29-2920-469a-9a6b-ca8175e0a047}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{921315ff-a234-415e-bcc0-e7d44f8a9496}</UniqueIdentifier>
+      <UniqueIdentifier>{3e5beb73-b875-4528-85f2-92f17f10b1ef}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{977ae80f-ab98-4da6-b02a-dc541fc62a14}</UniqueIdentifier>
+      <UniqueIdentifier>{40b31de2-b02b-417c-9a07-7c17ad1b749b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{15222d19-aa1e-4e7a-a500-604c21ab6359}</UniqueIdentifier>
+      <UniqueIdentifier>{17b33303-8ce9-40fb-8808-c233ab22fb50}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{009e9f81-bfde-48ac-89c2-68f1c271edeb}</UniqueIdentifier>
+      <UniqueIdentifier>{2a3ebeb4-229e-4093-92dd-f2e9cab1f3ff}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{53c3a4b5-e1a3-4673-b258-3e832dc27fbe}</UniqueIdentifier>
+      <UniqueIdentifier>{59b80b9d-f9c7-455b-80cf-0a3b64889850}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{1c97b4e1-a55b-4c6b-b6df-e507c55c69eb}</UniqueIdentifier>
+      <UniqueIdentifier>{48ac2aa3-ee7d-409c-837e-36456df33354}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{c01052b2-cabd-410a-917e-c491576628e2}</UniqueIdentifier>
+      <UniqueIdentifier>{cd17039c-8f54-43cd-926a-10812f9df710}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{89eff0d7-ffbe-4a2e-8242-c89f92fd6301}</UniqueIdentifier>
+      <UniqueIdentifier>{ed9f0712-d8cb-4f1d-a451-239716337a43}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{56a2991c-7b80-404e-8d65-a9966cb05e57}</UniqueIdentifier>
+      <UniqueIdentifier>{32307226-fca8-400a-87bc-65bb443f7baf}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{3adef306-6add-450c-8287-33ff742b3889}</UniqueIdentifier>
+      <UniqueIdentifier>{804f5239-4491-4427-94a8-c2daaeb2d67d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{af9a82ea-237e-42e5-b2dc-341287b8fb0f}</UniqueIdentifier>
+      <UniqueIdentifier>{4dd1580a-fca8-4cc1-a39c-a3deb7ef43f0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{eabc6b03-405e-426e-be45-94c745524016}</UniqueIdentifier>
+      <UniqueIdentifier>{b56443d3-31b8-4a98-809c-059f9d6816dc}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{8dce5b80-7a9d-49ba-a839-0e1b71a55f06}</UniqueIdentifier>
+      <UniqueIdentifier>{6881f4d1-cbba-44e4-9d66-45806530c541}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{730e0866-d1b6-4112-831a-9015c069b8c1}</UniqueIdentifier>
+      <UniqueIdentifier>{5e8d1c74-6092-43fe-a509-88fa474ea818}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{5c3801df-aa59-43b5-9d76-9add796824cf}</UniqueIdentifier>
+      <UniqueIdentifier>{43a445b8-975e-4e32-8f58-6558fb5d3040}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{9ad300da-0d2e-441f-b98b-83ae110050ce}</UniqueIdentifier>
+      <UniqueIdentifier>{7d1921da-63a1-40f1-b4a9-78b20a97fe37}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{e80fea6b-5292-4823-88b0-d7e06c15fac1}</UniqueIdentifier>
+      <UniqueIdentifier>{056ca7e7-ba0f-4110-8b15-6c7a755270b2}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{b33508c9-4eda-4a87-a697-e36f6b0507dd}</UniqueIdentifier>
+      <UniqueIdentifier>{810dcb26-353a-4f60-8287-196415f84f1e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{bc882a6a-7a39-48bd-a1fa-c477d6eea108}</UniqueIdentifier>
+      <UniqueIdentifier>{0c8d1342-1b09-436d-b7ea-8d25e5716d5b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{8112bfa1-d1db-4606-aba7-67388032e1fd}</UniqueIdentifier>
+      <UniqueIdentifier>{d7bbdae6-94fb-4201-a953-c9c79977f559}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{ae09252f-b13e-488c-bd1e-604ad3dc673e}</UniqueIdentifier>
+      <UniqueIdentifier>{3d168bc5-0b08-40fa-a392-22c5501b1056}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{6bf2ff5d-0867-4d71-9bf9-d0126918a5ac}</UniqueIdentifier>
+      <UniqueIdentifier>{f03724d4-f3a9-4e1b-b933-ed229fcf12e5}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{1212c7aa-632b-4135-9bb5-030133c23da3}</UniqueIdentifier>
+      <UniqueIdentifier>{13e8ebd6-7f1f-4a68-aa8f-5a912227bc2e}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{c56ef8a7-2144-4d36-874b-b23e85ac20de}</UniqueIdentifier>
+      <UniqueIdentifier>{a1a2af95-fa23-4afb-89ac-c7b1e6777bc9}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/Net/Net_x64_vs100.vcxproj.filters b/Net/Net_x64_vs100.vcxproj.filters
index 4ad62249a..2c0f18206 100644
--- a/Net/Net_x64_vs100.vcxproj.filters
+++ b/Net/Net_x64_vs100.vcxproj.filters
@@ -2,139 +2,139 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{d3008dba-917f-44d5-82b0-c9e8be0a6f51}</UniqueIdentifier>
+      <UniqueIdentifier>{a0374c81-feb4-4f33-b100-8cc11490c6ef}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{79cf9077-0e82-47c5-95d9-e64916560e4b}</UniqueIdentifier>
+      <UniqueIdentifier>{e9b9fe4e-3be8-408d-922d-860d5b1f39c8}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{039a79d3-57c4-4793-8df9-479c0ec77082}</UniqueIdentifier>
+      <UniqueIdentifier>{6b371848-2dee-4aed-9b2f-5875e17b88b3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{50b72a8b-2646-4187-b353-3992707c8106}</UniqueIdentifier>
+      <UniqueIdentifier>{9c6628ca-3f06-4b62-84b9-ded21b4eed3c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{955bff75-e4d9-4be7-8d7d-d15da48ac8cc}</UniqueIdentifier>
+      <UniqueIdentifier>{b534c5f9-cdf4-4db7-8d85-551e061ccce6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{74ea59d3-69e3-4435-acf6-630ce9e36505}</UniqueIdentifier>
+      <UniqueIdentifier>{e24bb8da-abe6-4b3d-8f5e-b323ca094050}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{e17fbd19-41ae-4850-b531-27112ff3603a}</UniqueIdentifier>
+      <UniqueIdentifier>{36da7fc8-ed25-4003-8327-9bd2fbbc69d8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{d2ac61ed-c839-4283-9cca-b34bf1e88622}</UniqueIdentifier>
+      <UniqueIdentifier>{92dcb42b-28b7-4390-8f9f-fc6e56d188c2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{042c5f8e-ed33-4abe-a8a0-377a2789242c}</UniqueIdentifier>
+      <UniqueIdentifier>{9b1f906e-e7b0-42a8-93db-bc0a6c255e24}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{a7a457ce-f935-4390-8c28-9e593b6c87cf}</UniqueIdentifier>
+      <UniqueIdentifier>{f3deaad7-9f3a-4d2d-9f0a-e9e741b3ab5e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{e122c056-3967-4e90-ad15-4ac895986b51}</UniqueIdentifier>
+      <UniqueIdentifier>{26263a42-ffd2-4f5e-affd-ec3959e5a272}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{dbe20e05-289c-4f68-949b-0b0f0dc8832c}</UniqueIdentifier>
+      <UniqueIdentifier>{5683c587-d84a-47d5-b877-4a78d8202423}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{4ef88655-6d63-4997-a819-355163dd718d}</UniqueIdentifier>
+      <UniqueIdentifier>{907c84c5-500a-46af-959f-c23dbd3cdb54}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{8399833b-309a-4629-8f9f-b09f970de8e8}</UniqueIdentifier>
+      <UniqueIdentifier>{3a49c428-6854-4020-abbf-3783eb9a1988}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{13147168-cb4b-490e-90b7-92cc37146c01}</UniqueIdentifier>
+      <UniqueIdentifier>{6535f0c2-5a17-48a7-8e35-46719e433e48}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{dc2f1250-6ed6-468d-82bf-5f5686c5a012}</UniqueIdentifier>
+      <UniqueIdentifier>{1fb66a91-1b75-4645-99d7-d7c09fd42383}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{8f448dd8-9f5f-4ee4-ad03-77ec8ba6c4be}</UniqueIdentifier>
+      <UniqueIdentifier>{c8f7934e-e535-4899-8614-9ae35dcfdb99}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{3aaf7c6f-7bdd-43a3-ac38-e061ec458028}</UniqueIdentifier>
+      <UniqueIdentifier>{14fa9e42-bcfc-4af2-92ed-9bea95513524}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{c536054f-a8a4-46c7-9d6d-a23f3481fd8b}</UniqueIdentifier>
+      <UniqueIdentifier>{afbbe8e8-8c1a-4fb8-be1d-016b6ee9e13b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{e4ef790c-01c0-43a8-a23c-e48e99682662}</UniqueIdentifier>
+      <UniqueIdentifier>{56b1114d-4cc3-4271-8772-6e7806897695}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{e42c99d2-8516-454c-9f11-76224053945d}</UniqueIdentifier>
+      <UniqueIdentifier>{666024fa-4999-4987-937a-0a3453e152dc}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{9500b16a-5021-45bf-866f-cf5acec79408}</UniqueIdentifier>
+      <UniqueIdentifier>{893c4593-7682-4483-97fc-818655851d1c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{b0a64912-64e5-4f83-b97b-817edfd81fac}</UniqueIdentifier>
+      <UniqueIdentifier>{c8392afc-18e3-49ba-905e-5221a565f1fa}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{b2e18da9-0f8c-42cd-84ab-8ac611b59805}</UniqueIdentifier>
+      <UniqueIdentifier>{d5b9ca9c-a7ea-4876-8812-994709345d9c}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{f2a680bc-730d-448f-960c-30dfe1a51c4f}</UniqueIdentifier>
+      <UniqueIdentifier>{fbc3805a-d5ed-467f-ad85-1725b9f0f59c}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{7d86c36f-9864-475f-9b28-7ec862735a4d}</UniqueIdentifier>
+      <UniqueIdentifier>{852c6f72-271b-410e-b487-e80f9d3531e5}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{b48260d2-4022-42b6-988e-b28e39345444}</UniqueIdentifier>
+      <UniqueIdentifier>{3c44e92e-5083-467c-991e-2a52ee618716}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{12ce2095-0b63-448d-8619-eedf3adf3170}</UniqueIdentifier>
+      <UniqueIdentifier>{304d88dd-7bcf-4713-97da-f88ee0cfddb3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{f0ad3d9c-3acd-438a-abfe-81997c3e5fa9}</UniqueIdentifier>
+      <UniqueIdentifier>{44232cff-4aab-4afd-b3aa-c89038b378ad}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{715aa320-3965-411c-a67a-6a55931c4b8a}</UniqueIdentifier>
+      <UniqueIdentifier>{aae9d17d-d845-49ae-92a2-82da47086a2b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{49a4e73d-a1b9-424a-be3e-0c635b47551b}</UniqueIdentifier>
+      <UniqueIdentifier>{61d7b1bc-d8a2-40e4-b50d-238cfeca9b7e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{2743c350-58e4-4de9-a043-e7ca653d0ad5}</UniqueIdentifier>
+      <UniqueIdentifier>{3a689579-17d0-4c55-84ab-9578c52e5b11}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{3db82e12-65bd-4d2c-ab06-36ba640b5dee}</UniqueIdentifier>
+      <UniqueIdentifier>{3f01faad-e010-41a7-b2ca-c552c3f52cec}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{4457ec56-9bde-4d5e-86a3-839202c01f49}</UniqueIdentifier>
+      <UniqueIdentifier>{53ab7a10-fdea-4ddd-9040-6d3390be40e5}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{ea5c59cc-9844-44a4-b108-75f96ef3332e}</UniqueIdentifier>
+      <UniqueIdentifier>{04e07714-9e4e-4d25-bec2-ca84154c9882}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{c4d2c6ac-5d2c-4b6d-9913-a0bc431b56f0}</UniqueIdentifier>
+      <UniqueIdentifier>{74b3133d-a94b-40c9-b5e6-3b25fa3a48f8}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{0587daf7-29be-4a18-a67d-0261e8630b0d}</UniqueIdentifier>
+      <UniqueIdentifier>{367d5a80-620d-4da4-a18d-56e6478218fe}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{b0f0fc71-db47-4bfd-a360-7222e15ee3d8}</UniqueIdentifier>
+      <UniqueIdentifier>{d7fad4e1-9765-4088-b4f4-b48ce618a851}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{41095bc8-537a-4def-a7c0-efd4b45e64f2}</UniqueIdentifier>
+      <UniqueIdentifier>{856ec146-1dce-401a-8c41-e97c7a446243}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{0be4eb52-0a25-40da-884c-513fbab72b9c}</UniqueIdentifier>
+      <UniqueIdentifier>{7167e166-e470-439f-b5b4-8ad2d580317b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{6be2c1e1-dcb5-4d07-808c-be41d09e9b7d}</UniqueIdentifier>
+      <UniqueIdentifier>{70bd78b7-a512-44fc-9430-9c77dae5dd72}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{b963bab6-61f5-4f34-8d53-d65dd135bd6c}</UniqueIdentifier>
+      <UniqueIdentifier>{0689b65f-aafa-4414-bfa9-0743f63ceb2d}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{55efb30a-51b3-48d4-83a4-f0ab03c6fb07}</UniqueIdentifier>
+      <UniqueIdentifier>{66f74322-73cc-4afc-aa8c-5a0dafd29a04}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{6960e095-591c-4bb4-8a40-da02a264705a}</UniqueIdentifier>
+      <UniqueIdentifier>{cde8bd16-9b90-4bbb-b3e8-0f58d7576f38}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{efd4dbfa-2b21-4fe9-a142-03e7ccfce9fa}</UniqueIdentifier>
+      <UniqueIdentifier>{178ac9a9-ee13-4144-ac96-1b9c803b7e38}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/Net/Net_x64_vs110.vcxproj b/Net/Net_x64_vs110.vcxproj
index e1794a67f..29195927f 100644
--- a/Net/Net_x64_vs110.vcxproj
+++ b/Net/Net_x64_vs110.vcxproj
@@ -85,7 +85,21 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">..\bin64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">obj64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">..\bin64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">obj64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">..\lib64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">..\lib64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">..\lib64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">obj64\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">..\lib64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">obj64\$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoNet64d</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoNetmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoNetmtd</TargetName>
@@ -93,32 +107,6 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoNetmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoNetmt</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
-    <OutDir>..\bin64\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
-    <OutDir>..\bin64\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
-    <OutDir>..\lib64\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
-    <OutDir>..\lib64\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
-    <OutDir>..\lib64\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
-    <OutDir>..\lib64\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -136,6 +124,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -168,6 +157,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -200,6 +190,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmtd.lib</OutputFile>
@@ -224,6 +215,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmt.lib</OutputFile>
@@ -247,6 +239,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmdd.lib</OutputFile>
@@ -271,6 +264,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmd.lib</OutputFile>
diff --git a/Net/Net_x64_vs110.vcxproj.filters b/Net/Net_x64_vs110.vcxproj.filters
index f68fb02da..09a0d34f6 100644
--- a/Net/Net_x64_vs110.vcxproj.filters
+++ b/Net/Net_x64_vs110.vcxproj.filters
@@ -2,139 +2,139 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{c5085ddf-8784-4203-9cdf-8d69b5442135}</UniqueIdentifier>
+      <UniqueIdentifier>{9a56165f-e1d6-4b41-ad72-8267cf671928}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{197de0a9-52ae-4dfd-9845-378faae7a75d}</UniqueIdentifier>
+      <UniqueIdentifier>{c6351abe-1460-46d7-b0f6-f7c46093ba76}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{71c6dfe4-1cc9-49f6-b500-d5a0b7468fc6}</UniqueIdentifier>
+      <UniqueIdentifier>{4bf3c63b-141b-490e-838a-180d41a942e8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{485aa434-9874-40ec-aacb-908fb152e687}</UniqueIdentifier>
+      <UniqueIdentifier>{1142fcb2-45c2-4776-9f06-5cb8d38ecd08}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{c66042a7-efa7-4e14-a55a-8d94a104975f}</UniqueIdentifier>
+      <UniqueIdentifier>{824d5ab1-602d-43e7-9ef1-a4f6ab484bee}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{05d7d478-0de3-4911-8cd7-7f2aa82673ac}</UniqueIdentifier>
+      <UniqueIdentifier>{6d594d40-5a8b-4cde-9fe3-825163cd0f11}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{08d9b32c-49c0-46a1-978c-2923ada3f7e9}</UniqueIdentifier>
+      <UniqueIdentifier>{d8043e4d-c2f7-43f7-8f3b-a708a4659b27}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{7e13b547-2c3d-43ea-a230-0858bc39cab9}</UniqueIdentifier>
+      <UniqueIdentifier>{6cf9c128-6c67-4a65-9a4c-721d80d2f292}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{8cbd9ab5-cd0d-4b04-a033-350bc56d71bc}</UniqueIdentifier>
+      <UniqueIdentifier>{61304afb-175f-45fd-b10f-b045b41b0f30}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{5f4189f8-afb6-4361-8354-190529a2db03}</UniqueIdentifier>
+      <UniqueIdentifier>{9efeb63f-2555-4cbc-891f-71408a4fc437}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{cc4ca6a8-e826-4216-9341-f1680f207def}</UniqueIdentifier>
+      <UniqueIdentifier>{3242bd47-ef18-4cd7-8f51-15d5852c2040}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{56b978d3-17ee-49d1-9d65-af5de30e692f}</UniqueIdentifier>
+      <UniqueIdentifier>{077141a3-b072-47da-b269-4f4644ae7cc3}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{dca62857-5f95-4f12-87d1-37276ee56608}</UniqueIdentifier>
+      <UniqueIdentifier>{29f4b3ae-937d-46a5-a2d3-74dbd9a75c4d}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{9744ae4e-9f00-4052-bfdd-f7814c846f2c}</UniqueIdentifier>
+      <UniqueIdentifier>{3c7d0972-ce28-4235-92cc-54487a51fb78}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{cf3ba7c5-559b-4716-bd6e-d947772b01b9}</UniqueIdentifier>
+      <UniqueIdentifier>{0b2dba96-fcfb-4ef1-b156-c19dd3e7044b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{55ce8909-ce9d-4ed5-8069-aa0d822f5086}</UniqueIdentifier>
+      <UniqueIdentifier>{1c809d89-347b-4da8-8dcd-4a3a75832efa}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{2f6e5da9-dca8-4a9b-9c58-f605685a5c22}</UniqueIdentifier>
+      <UniqueIdentifier>{10fed535-386a-4462-8e8b-a1b40f3e0118}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{5b2483c9-eef9-4e2b-a6fe-650985281eb6}</UniqueIdentifier>
+      <UniqueIdentifier>{c3944376-e82f-4591-bc11-f1858ea5b574}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{256617b0-9d11-4ddd-b30a-f56e68751ca5}</UniqueIdentifier>
+      <UniqueIdentifier>{2df7e967-76d6-478b-9e83-74b4265a305e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{4544200e-6702-4296-9937-380b0a59c061}</UniqueIdentifier>
+      <UniqueIdentifier>{4342750f-964f-462e-8ee1-9caf9481a8e4}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{432ee006-6d8a-4f26-9f97-dcf193fc204a}</UniqueIdentifier>
+      <UniqueIdentifier>{6cd28d77-4439-46a1-8507-72e521d58f27}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{e8991551-aa1b-4a02-9d7b-29a50dce3d22}</UniqueIdentifier>
+      <UniqueIdentifier>{6d0f4017-161c-45ee-a0eb-f22e0c0fd807}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{81390a9d-360a-4107-b627-1b6c89a3d304}</UniqueIdentifier>
+      <UniqueIdentifier>{7a98971c-116a-41f8-926a-9df233eaf820}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{37766398-8621-4d1d-8f63-97b6acb2841e}</UniqueIdentifier>
+      <UniqueIdentifier>{2ef45831-d51c-4fff-909d-7f297e43f796}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{5de3a075-e011-4495-b76c-65977e9494fa}</UniqueIdentifier>
+      <UniqueIdentifier>{5077a585-cc1e-4072-88cd-9b103f17f700}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{b1fbfe77-d7a4-4512-88d5-2ea4252c3a44}</UniqueIdentifier>
+      <UniqueIdentifier>{f36b4b14-348c-40bb-b659-b77ad50cefee}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{87fc3dae-95c2-4fb0-aeff-896506690e0c}</UniqueIdentifier>
+      <UniqueIdentifier>{27925550-b7ee-460f-ba9c-4805c6031191}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{a769f9df-79af-4657-823b-a6dde2ab9809}</UniqueIdentifier>
+      <UniqueIdentifier>{4d703a16-1cf4-475e-9c2f-209268e69531}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{19f6c3be-06c4-4d5e-b464-2a48bf8607cd}</UniqueIdentifier>
+      <UniqueIdentifier>{87de5c6d-1473-4beb-8d44-f4618ff4620f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{81b4cb13-2e3f-44dc-af1c-3a9225158c74}</UniqueIdentifier>
+      <UniqueIdentifier>{fc8f600f-beb5-416d-a2bf-a6cd02044399}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{5500b295-ee75-48f7-aacd-8c24508710ee}</UniqueIdentifier>
+      <UniqueIdentifier>{b83193af-6a88-403e-9491-20b7a3f9541e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{5f57d072-24ca-4170-829d-15dcf3d3bcab}</UniqueIdentifier>
+      <UniqueIdentifier>{72d22572-202b-4e3a-a914-c4f00f9d6ec8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{7c812ad5-a233-4f61-b68a-3b736434e70d}</UniqueIdentifier>
+      <UniqueIdentifier>{1219054f-7f4e-4b85-8680-482a026a0f8d}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{42839e23-2b2c-4115-a746-6d4b566914f7}</UniqueIdentifier>
+      <UniqueIdentifier>{7b58a6d6-75c3-4026-a4b8-01522296395f}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{7cb31c7d-14ad-497b-8e5d-364f8f63b031}</UniqueIdentifier>
+      <UniqueIdentifier>{c4230a8e-8cd7-4fc0-96a9-9dcfc3e993ad}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{75faca6e-1a2d-4632-b5c1-8ec465343ba3}</UniqueIdentifier>
+      <UniqueIdentifier>{82e7d6a6-c98a-42b7-8e1d-62852463691b}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{60df2f03-b736-4468-ab34-249a095e7dc6}</UniqueIdentifier>
+      <UniqueIdentifier>{46d4012d-e74b-4413-8eac-bb2da806588f}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{b7be512e-5852-492b-84f7-4262004df2b8}</UniqueIdentifier>
+      <UniqueIdentifier>{040ce062-8b0d-42ec-961a-44b7ce5725e4}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{5f5aeeb9-b6cb-45cc-ae7c-21afc0a6c618}</UniqueIdentifier>
+      <UniqueIdentifier>{d42702ba-d2f2-48c7-8571-85380408b8e2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{7773ae58-5912-4ebe-8ffb-273457512c54}</UniqueIdentifier>
+      <UniqueIdentifier>{2e0431c2-d3e5-4d66-b233-3c96a4b553b9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{dc7690d6-a96e-4c77-9602-ec173cea3a77}</UniqueIdentifier>
+      <UniqueIdentifier>{8b76dc30-a6ed-4b63-906d-2a05e3311697}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{295e591d-7e08-49ac-a97c-2d2b9d0f690b}</UniqueIdentifier>
+      <UniqueIdentifier>{c49b0fbf-60e3-4ede-a337-8b020826d906}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{d72fc387-ab1a-4724-aae6-501b75f99b9f}</UniqueIdentifier>
+      <UniqueIdentifier>{f53b9dde-88fb-4f2e-ac2a-963d8601b916}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{a747b192-f6cc-4da1-aa06-eebe6e4ba48b}</UniqueIdentifier>
+      <UniqueIdentifier>{4a285b54-2c89-4fe3-9f4b-3c81059b0e2e}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{bf175142-407e-475e-96f4-a410db4a87a8}</UniqueIdentifier>
+      <UniqueIdentifier>{4764d7c2-e581-42d2-8b8d-0e41fcdb2ede}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/Net/Net_x64_vs120.vcxproj b/Net/Net_x64_vs120.vcxproj
index bf17bf8d7..e9ccd8f74 100644
--- a/Net/Net_x64_vs120.vcxproj
+++ b/Net/Net_x64_vs120.vcxproj
@@ -85,7 +85,21 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">..\bin64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">obj64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">..\bin64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">obj64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">..\lib64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">..\lib64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">..\lib64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">obj64\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">..\lib64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">obj64\$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoNet64d</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoNetmdd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoNetmtd</TargetName>
@@ -93,32 +107,6 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoNetmd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoNetmt</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
-    <OutDir>..\bin64\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
-    <OutDir>..\bin64\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
-    <OutDir>..\lib64\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
-    <OutDir>..\lib64\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
-    <OutDir>..\lib64\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
-    <OutDir>..\lib64\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -136,6 +124,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -168,6 +157,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -200,6 +190,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmtd.lib</OutputFile>
@@ -224,6 +215,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmt.lib</OutputFile>
@@ -247,6 +239,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmdd.lib</OutputFile>
@@ -271,6 +264,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
       <OutputFile>..\lib64\PocoNetmd.lib</OutputFile>
diff --git a/Net/Net_x64_vs120.vcxproj.filters b/Net/Net_x64_vs120.vcxproj.filters
index b06c1663e..5fa9793d6 100644
--- a/Net/Net_x64_vs120.vcxproj.filters
+++ b/Net/Net_x64_vs120.vcxproj.filters
@@ -2,139 +2,139 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{c81bcb8a-f4bd-4a1d-b807-e72c13ba9f7d}</UniqueIdentifier>
+      <UniqueIdentifier>{a5421fb8-9879-4535-8adf-f2201dcabc41}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{b4895d74-7d0e-4277-9d8b-ac9df266f5e1}</UniqueIdentifier>
+      <UniqueIdentifier>{7996546b-a88b-499b-8052-9b1e573e75b6}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{6da504c2-c951-4a84-be82-0252bbc70b2a}</UniqueIdentifier>
+      <UniqueIdentifier>{20670cc7-f348-44f1-8b8d-29336bf5ca51}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{d2b5852a-0a25-4d9e-86c1-07e06df6861b}</UniqueIdentifier>
+      <UniqueIdentifier>{1bc14e8c-3cd5-4be2-955a-a228175dbc77}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{0e362fa6-b01a-47f9-bbf5-647da10be8d6}</UniqueIdentifier>
+      <UniqueIdentifier>{924c74ea-2c7e-447f-81cd-32171b0bf27e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{ef21d08d-ae83-4fdc-9f38-fcfe95954eb2}</UniqueIdentifier>
+      <UniqueIdentifier>{63316819-fdb1-4a08-8c6f-7d82d0484f10}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{0ca67dd8-7516-4c92-ba65-57df0a3949cd}</UniqueIdentifier>
+      <UniqueIdentifier>{96bfeaac-cd67-479b-8365-c5d6c74dfedc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{4cae1937-f090-4880-8812-0413353d0501}</UniqueIdentifier>
+      <UniqueIdentifier>{7617eb32-231e-44bf-929d-88d98aa93866}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{a2f8a178-f20b-4300-a149-819ab3ba1e7d}</UniqueIdentifier>
+      <UniqueIdentifier>{01dd7d09-12f5-488e-96a3-782d66ef1ee9}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{4c243b9d-3187-4ad7-81d3-3a9ba379e425}</UniqueIdentifier>
+      <UniqueIdentifier>{74f26ddc-f1a6-4422-9d33-e2ba5557379c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{c0c677fc-3100-4a2a-8b38-13aa4f9437b8}</UniqueIdentifier>
+      <UniqueIdentifier>{9888ac0b-c634-40ce-94dd-3de7b8c0ddf2}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{b2268d10-d1a7-4bb1-9a2b-a2b08cf3e11c}</UniqueIdentifier>
+      <UniqueIdentifier>{ad443051-ea89-411f-b99f-5b53517d5748}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{fe88c7cb-00b6-479a-a48b-3a5df8645fd8}</UniqueIdentifier>
+      <UniqueIdentifier>{6ee8fe4c-1b07-4f37-af8d-9777731c90b8}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{19633ec8-2141-45b9-9a3b-148eebac4601}</UniqueIdentifier>
+      <UniqueIdentifier>{0214a554-bf86-4f5a-b04f-8fe5089aa117}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{62a45608-fe09-40b5-a743-561529bb017b}</UniqueIdentifier>
+      <UniqueIdentifier>{710974f2-b297-47ae-a00b-d0ddd00011c2}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{e93e1b84-3dfb-4fe5-8a2c-0e0e36cbd448}</UniqueIdentifier>
+      <UniqueIdentifier>{5bb13dd8-7b33-4ac9-9aec-87774764c1b2}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{082683d3-4e6b-4d16-8f9e-7772b52b2326}</UniqueIdentifier>
+      <UniqueIdentifier>{d9640421-4a33-427b-84cd-ed3cb6d12378}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{c96689c1-9d31-4652-8a3f-8fc268ffc649}</UniqueIdentifier>
+      <UniqueIdentifier>{6e7e751d-69a5-45cf-84a4-1e88dfb988d4}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{652923d4-3a58-467c-9610-1dc008f91e2f}</UniqueIdentifier>
+      <UniqueIdentifier>{0cfac0e2-6d5f-4f57-94e7-e1a8c320281e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{c08d36b0-f47c-4b58-8e35-413eb7c95745}</UniqueIdentifier>
+      <UniqueIdentifier>{7f9f21d8-f142-4661-b587-d45bfd90071b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{ed69b49a-a9c8-4e3e-8c55-a82eff6dfa3c}</UniqueIdentifier>
+      <UniqueIdentifier>{c0e43d74-914c-40aa-8592-cf85879b64c6}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{daa56170-8ac6-431e-88ec-4ec2a261cfaa}</UniqueIdentifier>
+      <UniqueIdentifier>{d01b0634-ca3b-441b-bf9a-b8d1f0881c33}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{3b047d27-bbdb-4aee-b124-58759d002371}</UniqueIdentifier>
+      <UniqueIdentifier>{fa67e31e-1af9-4754-84ec-4efcb603d4ea}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{24f24808-90cc-4060-b1bb-4c1c686455b3}</UniqueIdentifier>
+      <UniqueIdentifier>{6686936a-0b75-4e2d-a05d-1bedfdb33e92}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{d4cef422-e320-49eb-888c-31bc5ae33dc2}</UniqueIdentifier>
+      <UniqueIdentifier>{029c8d6b-fb0b-455a-9722-f12b07c312df}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{65c4420f-7a01-4383-9685-890fa4db4e97}</UniqueIdentifier>
+      <UniqueIdentifier>{9eb98b18-1099-4488-b9eb-a541c3661906}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{971c96c8-6322-455d-ab5b-8bae5fcf52cd}</UniqueIdentifier>
+      <UniqueIdentifier>{6c1ba6a6-7c65-48f0-8f6f-9c0ada1eac99}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{5e9ca994-29bd-4264-b0d6-e2df30f64712}</UniqueIdentifier>
+      <UniqueIdentifier>{47331b41-726d-4754-bd76-9a6a5aa26ece}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{0dd46ada-6158-481c-9c74-37e21fdfe9dc}</UniqueIdentifier>
+      <UniqueIdentifier>{a56ab02c-dfb2-475a-be60-181bb3916411}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{7a1f0820-a9cc-45f9-b801-f0e0e62baee8}</UniqueIdentifier>
+      <UniqueIdentifier>{709b9e94-b8e4-4fd5-9c6e-6ccf4d6605a1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{79f192e9-670f-46c0-9924-7ae1a9ceb1b8}</UniqueIdentifier>
+      <UniqueIdentifier>{4c7cf377-7abd-49c7-989d-51147b2d1f36}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{c9d81435-aec9-4b63-9bfc-801a7be5282b}</UniqueIdentifier>
+      <UniqueIdentifier>{348ce6ef-8a02-438d-b1ee-d04a15a4ef13}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{5e64d3fc-7ae6-4514-9357-f91eb909a208}</UniqueIdentifier>
+      <UniqueIdentifier>{a31e9960-e81d-44ea-bbf9-409d45e9a2f9}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{30bfe833-bfb8-4f67-bb0c-a2b52ba5a00f}</UniqueIdentifier>
+      <UniqueIdentifier>{2bf43e56-dcca-4acd-9c5b-b2c44c5608f4}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{d1b9b109-b2b9-478d-9c7a-c77956a9d3bf}</UniqueIdentifier>
+      <UniqueIdentifier>{982077de-d336-4174-b1ce-b461fefdf4e0}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{7affbf87-abad-467d-a497-777d5971acf8}</UniqueIdentifier>
+      <UniqueIdentifier>{3048221e-045d-4cec-8e09-7e336c7a38df}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{8f59570b-86aa-422a-bb54-5009298439e0}</UniqueIdentifier>
+      <UniqueIdentifier>{1c9415f7-1920-4f49-8671-d08130fe9961}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{1eca4a9d-af7d-42c3-9bde-05833e5ad968}</UniqueIdentifier>
+      <UniqueIdentifier>{76540d9a-ac02-4b1f-836a-8a2eeeb9f9c1}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{81bd7514-94d2-47ca-a643-ecafa8b00a96}</UniqueIdentifier>
+      <UniqueIdentifier>{8dabe3b1-b8bc-4e3c-9498-2ed13208f455}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{837db365-4ed7-4d9c-9087-0150a3e9a45b}</UniqueIdentifier>
+      <UniqueIdentifier>{96f21dc6-aecb-4253-b75e-5b9eb6cd6fa7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{3ca0337b-c6cd-4561-8d5a-96f025ba3bfe}</UniqueIdentifier>
+      <UniqueIdentifier>{7d1023c7-971c-4a85-a62d-993313fabe31}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{abab3509-34ff-40b3-88e1-766851705a63}</UniqueIdentifier>
+      <UniqueIdentifier>{03aa6ccb-7dcc-4a5f-a183-a9abb7569554}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{e2470f36-c7af-4765-8c24-f3042c0e395c}</UniqueIdentifier>
+      <UniqueIdentifier>{6f8efda1-6718-4673-bc68-c202d1267b80}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{25c00fd7-ede0-479f-9a5a-0b19098ee114}</UniqueIdentifier>
+      <UniqueIdentifier>{f320560d-dc1c-4e54-9655-28f672bdde86}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{761a2129-afdb-4e1c-a5c7-eafa4889e77a}</UniqueIdentifier>
+      <UniqueIdentifier>{d7324767-5716-44e6-b62f-cf6644ab5ec1}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/Net/testsuite/TestSuite_CE_vs90.vcproj b/Net/testsuite/TestSuite_CE_vs90.vcproj
index 1e86d0429..1fbcfaff7 100644
--- a/Net/testsuite/TestSuite_CE_vs90.vcproj
+++ b/Net/testsuite/TestSuite_CE_vs90.vcproj
@@ -789,6 +789,23 @@
 					RelativePath=".\src\ICMPSocketTest.cpp"/>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="NTP">
+			<Filter
+				Name="Header Files">
+				<File
+					RelativePath=".\src\NTPClientTest.h"/>
+				<File
+					RelativePath=".\src\NTPClientTestSuite.h"/>
+			</Filter>
+			<Filter
+				Name="Source Files">
+				<File
+					RelativePath=".\src\NTPClientTest.cpp"/>
+				<File
+					RelativePath=".\src\NTPClientTestSuite.cpp"/>
+			</Filter>
+		</Filter>
 		<Filter
 			Name="Logging">
 			<Filter
diff --git a/Net/testsuite/TestSuite_vs100.vcxproj.filters b/Net/testsuite/TestSuite_vs100.vcxproj.filters
index 86ea3bd14..46a0dc0f9 100644
--- a/Net/testsuite/TestSuite_vs100.vcxproj.filters
+++ b/Net/testsuite/TestSuite_vs100.vcxproj.filters
@@ -2,154 +2,154 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{a7115ffc-d124-4bd5-855c-f23a4bc1fce5}</UniqueIdentifier>
+      <UniqueIdentifier>{ec685275-50f8-4233-841b-6aa30c6395da}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{0064d6fa-5f12-429b-aa57-315bc2dfe416}</UniqueIdentifier>
+      <UniqueIdentifier>{9dd0b247-1fc1-4208-a018-2c1e8fbacafb}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{798da3a7-c240-4990-99a6-cb489e17111e}</UniqueIdentifier>
+      <UniqueIdentifier>{ea1173c8-f6fe-49bf-9dd7-a397cf54534a}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{1c46b64a-24f2-4de0-a10f-43de22a3a79c}</UniqueIdentifier>
+      <UniqueIdentifier>{bf7255ac-9e31-410c-a125-4cb149164b8b}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{4259235c-4a54-4501-a76c-9d99134565b6}</UniqueIdentifier>
+      <UniqueIdentifier>{df07dc44-8bb8-4b22-ae33-b52ad959eb4c}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{debe742b-77ae-4439-ad36-7667f26f6659}</UniqueIdentifier>
+      <UniqueIdentifier>{4254118a-8f32-4335-8674-ea884beda763}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{657237a2-f0f6-4746-a82d-7c9ab3c37cf2}</UniqueIdentifier>
+      <UniqueIdentifier>{0f1c1af2-aed0-4209-9da5-99acfb2a614a}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{158ae8ed-8191-4b91-9433-32819fd0e4f8}</UniqueIdentifier>
+      <UniqueIdentifier>{1e9074ae-bf52-4ecf-a42d-8639077a6c23}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{a996f827-2244-4cf1-a163-b3f8a8d4ca7b}</UniqueIdentifier>
+      <UniqueIdentifier>{d692ce89-5e6c-42b0-8388-d66ed5069eb6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{e8b31b45-17e1-4d20-96d2-77c23e4231a2}</UniqueIdentifier>
+      <UniqueIdentifier>{ec70344e-251e-4276-9994-5e07377c1279}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{f5f370e1-7b18-46b5-b6c1-e46dfe8e371f}</UniqueIdentifier>
+      <UniqueIdentifier>{6b5a15d3-e67c-40d5-94f6-98edaf64197a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{32d8f6d6-b898-456e-9da2-727bb26bd4b0}</UniqueIdentifier>
+      <UniqueIdentifier>{16d79d5f-b170-43c1-b54b-9b9b0d9d8e5d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{73628bde-95f8-4db5-b795-5965208ab2f2}</UniqueIdentifier>
+      <UniqueIdentifier>{02a4014b-80a5-407d-9548-a17afc17485e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{12b4ac2e-5095-4bf4-8ed7-80239ef48e24}</UniqueIdentifier>
+      <UniqueIdentifier>{66745f49-4f2a-4efc-9868-15f0887aa48e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{b7d3af58-9731-48f8-b469-ad35d4bd2c9a}</UniqueIdentifier>
+      <UniqueIdentifier>{d9e8c152-885d-4bde-b0d6-34b52d5bcecc}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{9d8b5109-bc86-4cdc-9e99-120d238fc128}</UniqueIdentifier>
+      <UniqueIdentifier>{e633b12b-f3d1-4ef8-ba07-1fc4de103a49}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{a794a6cd-e79f-4706-a279-8a452ad27752}</UniqueIdentifier>
+      <UniqueIdentifier>{4129eae2-8dc3-47f4-a147-ce709c632684}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{4b08bd91-32f4-473c-9769-b7e5b5727cf5}</UniqueIdentifier>
+      <UniqueIdentifier>{608e9e58-05e4-449c-ad87-2d584dfc5448}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{4c47f71c-fe81-438d-b2d3-9d9f0b8f019f}</UniqueIdentifier>
+      <UniqueIdentifier>{adb75eca-3f9d-4d99-bbbb-ead368165991}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{e8717c6e-db2c-4b57-9a1e-7d81668b29fe}</UniqueIdentifier>
+      <UniqueIdentifier>{c6528155-dead-4ae2-9ba5-5f865a397b47}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{24632d19-3595-49bc-936d-59d7ddc43c82}</UniqueIdentifier>
+      <UniqueIdentifier>{ec69ce12-bd85-4b76-8fbd-7b2ffe607e1c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{12bd9017-15f3-4bd9-bd70-065a5de0cb9d}</UniqueIdentifier>
+      <UniqueIdentifier>{49ecbbd5-d2f6-4b55-bc85-4795d3c3ca66}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{f7e9ef09-caec-4b70-ae5c-db7e89fe02f4}</UniqueIdentifier>
+      <UniqueIdentifier>{be9cea67-bd54-4283-b509-9143a0611cfe}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{9ef76c70-a3f3-4bbb-8d20-60195d9d14f4}</UniqueIdentifier>
+      <UniqueIdentifier>{076ec6d5-df52-4565-a87f-5aeb46c4be77}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{65f79dab-58ef-4b5d-a22c-597c44850a8f}</UniqueIdentifier>
+      <UniqueIdentifier>{5c8fc693-ee11-404c-af0f-9df5b7161bed}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{9a22445c-ff74-434e-8974-412140bed89a}</UniqueIdentifier>
+      <UniqueIdentifier>{e8404aa9-a0be-4f17-b978-3f7d88470e35}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{28c4ab71-5522-4aa8-b2e3-7ba8f32c931e}</UniqueIdentifier>
+      <UniqueIdentifier>{4aadc2e8-8c68-4bd4-b2d9-955fd942581d}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{25b9c798-b014-48eb-8c6d-1b10475ee09d}</UniqueIdentifier>
+      <UniqueIdentifier>{f6eaf947-d1c5-47c8-9797-4cb9fd5b58fc}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{2bbd65e2-5d4b-47d7-887d-e07486c3f214}</UniqueIdentifier>
+      <UniqueIdentifier>{ef78aeb3-5497-44d4-a710-6018e508f7c2}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{cfdd972e-1a67-43f4-addb-6d01af93c62f}</UniqueIdentifier>
+      <UniqueIdentifier>{f8dc80ef-8829-4b41-a264-2226ac9ec167}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{32caadcc-ceac-4d36-b28b-6d0423556587}</UniqueIdentifier>
+      <UniqueIdentifier>{dd217f7c-620d-4a4b-bf86-8b9860b0e6d4}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{8fb94095-9e9a-4d99-99bb-6f47d1f5b347}</UniqueIdentifier>
+      <UniqueIdentifier>{2dbbd39c-8e20-44a7-865a-031893789b01}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{e9086686-506a-4d66-b8fa-017b4e77c565}</UniqueIdentifier>
+      <UniqueIdentifier>{da476b74-a51b-40f6-8df4-ecead22be265}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{3291b772-73a7-4961-a394-e0b1880b4534}</UniqueIdentifier>
+      <UniqueIdentifier>{67152153-bacd-40c9-8695-4f22997f148c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{5292bf46-d656-4cdd-a73f-63b32aa5dbfc}</UniqueIdentifier>
+      <UniqueIdentifier>{4ea08cb5-4b23-4167-aa2d-9243159e7f46}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{9c6af3a8-42c7-4c58-8029-9b5c908f5731}</UniqueIdentifier>
+      <UniqueIdentifier>{bd2c338b-0b23-4bd8-a161-8685954af57a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{ffc64058-5958-4e85-bb19-d1507881daf4}</UniqueIdentifier>
+      <UniqueIdentifier>{c0af64a0-0c89-477d-8487-1f9678218590}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{f8112cad-73a3-4b27-a86f-1406f9082cd2}</UniqueIdentifier>
+      <UniqueIdentifier>{2055996c-84af-4900-baec-0dd3a3b10577}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{85900ac4-9450-4709-8c96-e69889cbc783}</UniqueIdentifier>
+      <UniqueIdentifier>{07ea9906-87db-497f-8825-c22fe3dc5648}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{7df1335f-28e4-47bd-a542-f94a27e0b84d}</UniqueIdentifier>
+      <UniqueIdentifier>{82a21616-0d72-4a4b-86e4-9f32f01cc4d2}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{06cc64e4-544e-4f96-842d-5d8c16a3337e}</UniqueIdentifier>
+      <UniqueIdentifier>{4c0c2a45-641e-49db-a729-e3ae7291d065}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{b7a7a4b2-d2a6-4638-b59c-ebd1aaba305e}</UniqueIdentifier>
+      <UniqueIdentifier>{27de4c5e-6b01-4980-a85a-7bdd1a891e7b}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{ac88dcda-b149-46db-b263-f7365cbe4cd1}</UniqueIdentifier>
+      <UniqueIdentifier>{9a7c7f2d-f276-47f0-869a-2f76eb63b8f3}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{f5a9229b-83a9-4021-8814-ad0290c76acf}</UniqueIdentifier>
+      <UniqueIdentifier>{7201b04f-540a-47d8-a75a-c817859cc459}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{cc7f34bc-8e64-4f98-974a-b596f43c05bb}</UniqueIdentifier>
+      <UniqueIdentifier>{71e10e98-6739-4327-b5b7-ca4db32d3506}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{bbb1ce1e-e43a-4a1f-a9ee-8265f281fc0a}</UniqueIdentifier>
+      <UniqueIdentifier>{4fcc08df-4a43-4f0f-9904-4d511f3fa1f4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{9eac391a-ff7a-486f-a250-af880698399b}</UniqueIdentifier>
+      <UniqueIdentifier>{9f369571-0ec1-4e0d-8962-7fb779b19b2a}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{3c7e8981-12a7-4a8f-9103-086e9ddc75a0}</UniqueIdentifier>
+      <UniqueIdentifier>{4bc86117-b69b-42a7-bbb9-e962906b5446}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{fe904e37-a165-4416-a1ad-38a3157baa69}</UniqueIdentifier>
+      <UniqueIdentifier>{24d95fcb-fdad-41ef-b454-6af4fa2607f5}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{4e955e68-3310-4c72-b418-e1f8504e1211}</UniqueIdentifier>
+      <UniqueIdentifier>{d7c15573-b1df-453c-aa19-b377b359eee9}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/Net/testsuite/TestSuite_vs110.vcxproj b/Net/testsuite/TestSuite_vs110.vcxproj
index 3336630ff..e52ccf4a1 100644
--- a/Net/testsuite/TestSuite_vs110.vcxproj
+++ b/Net/testsuite/TestSuite_vs110.vcxproj
@@ -91,7 +91,25 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">bin\static_mt\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">bin\static_mt\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">bin\static_md\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">bin\static_md\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">false</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -99,36 +117,6 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">TestSuite</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
-    <OutDir>bin\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
-    <OutDir>bin\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
-    <OutDir>bin\static_mt\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
-    <OutDir>bin\static_mt\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
-    <OutDir>bin\static_md\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
-    <OutDir>bin\static_md\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -146,6 +134,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -177,6 +166,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -206,6 +196,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -238,6 +229,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -268,6 +260,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -299,6 +292,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/Net/testsuite/TestSuite_vs110.vcxproj.filters b/Net/testsuite/TestSuite_vs110.vcxproj.filters
index a1c8778e0..e32111e90 100644
--- a/Net/testsuite/TestSuite_vs110.vcxproj.filters
+++ b/Net/testsuite/TestSuite_vs110.vcxproj.filters
@@ -2,154 +2,154 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{0bae87a1-affe-4eff-b36a-3f5bf6ffd468}</UniqueIdentifier>
+      <UniqueIdentifier>{1d02904f-b1bb-4f25-862a-e6a99d695f44}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{803512ef-ad06-4c60-91bc-dc5ad166a7ff}</UniqueIdentifier>
+      <UniqueIdentifier>{b94115f5-fef3-4c76-aefa-6883f7453ad5}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{68c8eed3-cfbc-4d8c-91fa-d25c2ef33dc0}</UniqueIdentifier>
+      <UniqueIdentifier>{2ba50050-8918-48dc-98f8-b2c404a9cbba}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{d43f81d4-d9bd-404d-84f8-1ec1e3126d5e}</UniqueIdentifier>
+      <UniqueIdentifier>{d50fcd80-fca8-4efc-b772-0575ed1de642}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{39653ab2-7476-4b8f-a02b-55fb951a1ab9}</UniqueIdentifier>
+      <UniqueIdentifier>{969c59ab-6f94-4fcf-aeea-acd6b9551a3d}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{62650e54-9763-4d28-b6e7-8178f3cf4728}</UniqueIdentifier>
+      <UniqueIdentifier>{c949b3e7-6708-42dd-a0a2-3ab7e4d6d448}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{118bcf82-cb49-47da-8957-8ed4850c2063}</UniqueIdentifier>
+      <UniqueIdentifier>{9b6b9d46-23ed-41a8-8d74-5af91639fd70}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{037b7c25-3021-4bee-b704-d60a96485974}</UniqueIdentifier>
+      <UniqueIdentifier>{3fd2a1e5-ba4e-48a1-883a-d2c19dcbb34b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{8c7d4482-2329-441a-9a8e-50f99f01219d}</UniqueIdentifier>
+      <UniqueIdentifier>{69b7c0ce-4254-45ed-b861-ccb39c002867}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{c8eba6a7-7873-4cb6-95e2-ec9767c18b24}</UniqueIdentifier>
+      <UniqueIdentifier>{2fa4ea5e-0a94-423e-be29-bb18806a6688}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{f1791b3d-d119-49ae-b1ee-0ebb699f0d4e}</UniqueIdentifier>
+      <UniqueIdentifier>{5652a32c-a2c4-40a0-b49d-3c4bad32d226}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{2dfc1438-6513-45c9-920b-ddee10c20020}</UniqueIdentifier>
+      <UniqueIdentifier>{e41ccc15-0ec8-4c82-9b12-ecb31376ff6e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{c76799a2-5982-4b3f-a735-de69b9bcabf7}</UniqueIdentifier>
+      <UniqueIdentifier>{0469577e-d75b-49ba-8411-298f12848755}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{c493a16e-36c5-42ee-b064-d88afae4997a}</UniqueIdentifier>
+      <UniqueIdentifier>{19d4837c-b819-43e9-8f82-c4a75f080210}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{908d885e-c63b-48f0-b3c9-a045584752f2}</UniqueIdentifier>
+      <UniqueIdentifier>{57cd96fb-2365-4e83-9264-be5f149a27ed}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{7c2ca5a4-abd3-4be3-bfbd-a01cf884d2f5}</UniqueIdentifier>
+      <UniqueIdentifier>{52e67ed0-a04e-4c88-82a2-0e41a4d0333b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{1653d9ba-e149-4cd6-a606-035dbd905894}</UniqueIdentifier>
+      <UniqueIdentifier>{120a4324-737b-427f-9394-b4fa3fa2c694}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{511086d5-476c-4bbc-bded-71f2078fe47c}</UniqueIdentifier>
+      <UniqueIdentifier>{b659be32-9cd0-4907-8fe0-20253db9bb43}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{23c90a01-5256-43aa-b85e-77d993f1e76e}</UniqueIdentifier>
+      <UniqueIdentifier>{88d2f5da-49c9-4c7e-a2da-b615a3dfeb2d}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{6a7f44ff-53dd-4ea7-be8c-a59d52c731ea}</UniqueIdentifier>
+      <UniqueIdentifier>{1a252eb9-0eff-4b29-9d0a-d71b6b197c9b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{259056c0-4931-4ef9-8bda-70b7bfc84cb2}</UniqueIdentifier>
+      <UniqueIdentifier>{bb98da8a-388e-45f3-96f8-f64e0c887b3e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{3393b441-0b5c-4b52-844e-2a0a23bb87d4}</UniqueIdentifier>
+      <UniqueIdentifier>{2eba7177-2c72-45f4-b8ea-34e6bacb859e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{8cf719ec-69a4-4383-8862-c0c3aacd12b4}</UniqueIdentifier>
+      <UniqueIdentifier>{f69ff2d4-7334-4aab-9700-fbae184b7bfe}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{1bb1b70f-b8a4-4b94-a82d-5b96074a9bcc}</UniqueIdentifier>
+      <UniqueIdentifier>{5de6700f-3fd2-43db-ba60-c7a9c50fd7dd}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{3026d6d7-21c7-4fa4-8512-92b9ce0d41d2}</UniqueIdentifier>
+      <UniqueIdentifier>{ea1861c8-afe5-496d-ae94-647368aea08f}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{c6a6d73b-f990-49d6-a23a-0e2f7da4cfe7}</UniqueIdentifier>
+      <UniqueIdentifier>{8bc4cd3e-035a-436a-8896-4d3c5b444599}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{c3d9a265-0f65-4b23-a691-f6063487f167}</UniqueIdentifier>
+      <UniqueIdentifier>{27eded29-6059-46d2-9297-4681d8062790}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{7fd4acb3-43ed-4360-a598-2a44f8858e86}</UniqueIdentifier>
+      <UniqueIdentifier>{6a2ec9ad-cd46-4b6a-93b4-cf769191cde0}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{a79d5c85-c4da-43a2-913a-e746ec7c5597}</UniqueIdentifier>
+      <UniqueIdentifier>{015292d7-9f7a-4770-aa09-e4e08f17655f}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{a39c656d-38ce-417c-9514-8113628af35a}</UniqueIdentifier>
+      <UniqueIdentifier>{8dc88e24-60c0-42d7-bc3f-0cdc0c55a44e}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{cb18c4d5-8393-4077-bd10-42f492aafd3a}</UniqueIdentifier>
+      <UniqueIdentifier>{c4ef9084-66e0-434f-a6a4-f48dcb13ea32}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{b9c1827d-8628-49e2-a85e-2274e2d614a0}</UniqueIdentifier>
+      <UniqueIdentifier>{a360a97c-3070-4716-86c4-51dfbfaa7d77}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{bd954893-6d1f-4491-be41-565b0a7778e9}</UniqueIdentifier>
+      <UniqueIdentifier>{4608d996-03d3-4bb3-85d7-a52f794b8602}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{34b676e7-9960-45f3-a82e-21ff5302f8f7}</UniqueIdentifier>
+      <UniqueIdentifier>{b3d3a28c-1284-4b1e-8bed-bc2232594978}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{f3c24d99-b1e4-4428-9b88-9d2dc80a83ca}</UniqueIdentifier>
+      <UniqueIdentifier>{240b2a8a-ad65-42c4-a4d5-f75af2644990}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{2cc23f66-e6b8-4486-a274-7614ac5a1e45}</UniqueIdentifier>
+      <UniqueIdentifier>{37df337d-5b87-4814-b20d-d3fef60d9996}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{3fc65bd5-71ed-4a35-b34f-617c6452a117}</UniqueIdentifier>
+      <UniqueIdentifier>{8d18e4b5-c4e1-42f9-bbe6-29dfb455f4b3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{16e164f9-9f55-4fb7-8f81-3f7e93718597}</UniqueIdentifier>
+      <UniqueIdentifier>{e6a24823-323b-4eb4-bf6a-c47c9cbf7dc7}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{a597dd24-8219-4906-96c3-597f043b276c}</UniqueIdentifier>
+      <UniqueIdentifier>{529c29c2-a686-48b4-b118-5b6564d3eebe}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{d9423b0a-c554-4374-bbfd-3e6e610ce87f}</UniqueIdentifier>
+      <UniqueIdentifier>{2303bc17-9732-4878-9b99-2846b653370f}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{063b2e28-a9e9-461e-afe1-b22ffe0d3899}</UniqueIdentifier>
+      <UniqueIdentifier>{6e9e2b41-5726-4a38-a6e4-593a838b0ae7}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{1a1055d7-ba78-48dc-bc37-143057cba9ea}</UniqueIdentifier>
+      <UniqueIdentifier>{2ebf187e-295e-4f00-9304-d702732f3469}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{d41da626-0316-45f4-b09b-3f57a6964cd4}</UniqueIdentifier>
+      <UniqueIdentifier>{1d04d631-7495-4e5a-9ba4-bf6a7b6f96ef}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{30cd0454-3d02-4a69-9569-ee3f55b906ae}</UniqueIdentifier>
+      <UniqueIdentifier>{fd6b79ac-7866-4008-bfde-ca39cc2fdf83}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{ef8fe8ff-a5f0-4390-b5d4-b1a64454c5a2}</UniqueIdentifier>
+      <UniqueIdentifier>{1a556053-85e4-4196-98d1-b3dbdbb178e2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{72889f5b-600c-4b96-9078-d8d801a0bb12}</UniqueIdentifier>
+      <UniqueIdentifier>{8295249e-f209-414d-a025-b1bd0831bafc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{d1446cc7-1517-4578-8952-8b585aa099b3}</UniqueIdentifier>
+      <UniqueIdentifier>{2c19d8d7-5a80-4427-93f7-41bc28fdaf6e}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{3f193812-2659-47a4-8271-6f2fd1013cc6}</UniqueIdentifier>
+      <UniqueIdentifier>{ae99cdec-2c84-42d6-8e16-99903544f1b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{73a1fdbf-3f9f-481e-8343-d391fe554a34}</UniqueIdentifier>
+      <UniqueIdentifier>{bf161240-afe2-4749-87e7-d88cfe588ad8}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{b23e5ebe-82c1-4420-8c25-ec3f24ef142e}</UniqueIdentifier>
+      <UniqueIdentifier>{317e61e5-0d44-45c2-bfe5-af5aea1afb3b}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/Net/testsuite/TestSuite_vs120.vcxproj b/Net/testsuite/TestSuite_vs120.vcxproj
index 75db1c628..8ccabc960 100644
--- a/Net/testsuite/TestSuite_vs120.vcxproj
+++ b/Net/testsuite/TestSuite_vs120.vcxproj
@@ -35,31 +35,37 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
@@ -85,7 +91,25 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">bin\static_mt\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">bin\static_mt\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">bin\static_md\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">bin\static_md\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">false</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
@@ -93,36 +117,6 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">TestSuite</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
-    <OutDir>bin\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
-    <OutDir>bin\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
-    <OutDir>bin\static_mt\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
-    <OutDir>bin\static_mt\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
-    <OutDir>bin\static_md\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
-    <OutDir>bin\static_md\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -140,15 +134,16 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -171,13 +166,14 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
@@ -200,15 +196,17 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -231,13 +229,15 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
@@ -260,15 +260,16 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -291,13 +292,14 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
@@ -369,7 +371,7 @@
     <ClCompile Include="src\NetworkInterfaceTest.cpp"/>
     <ClCompile Include="src\SocketAddressTest.cpp"/>
     <ClCompile Include="src\NetTestSuite.cpp"/>
-    <ClCompile Include="src\Driver.cpp"/>
+    <ClCompile Include="src\WinDriver.cpp"/>
     <ClCompile Include="src\DatagramSocketTest.cpp"/>
     <ClCompile Include="src\DialogServer.cpp"/>
     <ClCompile Include="src\DialogSocketTest.cpp"/>
diff --git a/Net/testsuite/TestSuite_vs120.vcxproj.filters b/Net/testsuite/TestSuite_vs120.vcxproj.filters
index 103e4463f..1cc2639d6 100644
--- a/Net/testsuite/TestSuite_vs120.vcxproj.filters
+++ b/Net/testsuite/TestSuite_vs120.vcxproj.filters
@@ -2,154 +2,154 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{f259ee4e-29da-474b-bd43-02850764391d}</UniqueIdentifier>
+      <UniqueIdentifier>{d6a4922e-74eb-4a7a-9d63-81abae04569f}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{b34bc993-7def-420e-9d67-7560b5d590b3}</UniqueIdentifier>
+      <UniqueIdentifier>{a200ead3-27e4-491d-bab3-1d4593272921}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{c70d6cca-6ae5-4d2e-b6b9-c9853d8f47ce}</UniqueIdentifier>
+      <UniqueIdentifier>{4c663d06-7585-4d05-87ff-8e0a4f48d934}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{115733e0-cac9-4d06-851a-51b883e086f4}</UniqueIdentifier>
+      <UniqueIdentifier>{1e5adf2e-662c-47cd-a1a6-fa6f7861b58e}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{0b821bb5-9a22-4eb2-94aa-b9329acbb89d}</UniqueIdentifier>
+      <UniqueIdentifier>{5034e890-cb8f-4ed6-b781-955cbfd59c43}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{45dc3033-c32a-4bd1-8546-4544c084576b}</UniqueIdentifier>
+      <UniqueIdentifier>{48aa8ab1-5dd6-4ede-97d5-50976389b828}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{8e3f80fb-3912-4ae8-9dbf-079f4f9ab35e}</UniqueIdentifier>
+      <UniqueIdentifier>{67abf777-0cf5-4c89-a6ef-ac5a23fb7851}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{27c6d776-cdc5-49a5-89e6-5c10b2963665}</UniqueIdentifier>
+      <UniqueIdentifier>{9274f2c9-2582-4e0f-bff7-18d6d93defef}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{23021f90-e466-4d8a-be7a-4cc575ad2ffc}</UniqueIdentifier>
+      <UniqueIdentifier>{5327d6ba-0c4a-4202-b350-e267ec5f83a4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{e61a8945-039a-409d-889e-b717a5d95e90}</UniqueIdentifier>
+      <UniqueIdentifier>{a91b7116-ec0f-4100-9044-a7171586aa78}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{95f28ac6-f3e7-42e3-84d9-c318e961749b}</UniqueIdentifier>
+      <UniqueIdentifier>{49c4d984-998e-484b-90ec-761ae9d5c248}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{afc8308b-b468-4076-8655-cdaaf8d901ff}</UniqueIdentifier>
+      <UniqueIdentifier>{8335937b-ec38-4005-96f5-318bcd7ffa87}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{b88a418d-c8e0-4381-8647-4d2cb71dde51}</UniqueIdentifier>
+      <UniqueIdentifier>{5287131c-71cd-4c36-9348-161b9abd5bf4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{341110bf-7038-44fc-a191-6148c2aa6969}</UniqueIdentifier>
+      <UniqueIdentifier>{54109238-4cc2-450c-bc50-a771dffffa90}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{89974cf5-8695-4292-b608-05f1458815e8}</UniqueIdentifier>
+      <UniqueIdentifier>{f24f45d3-405d-451d-b248-78a9512b0652}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{75b6055a-a69a-46b8-b33a-0ea331a3892d}</UniqueIdentifier>
+      <UniqueIdentifier>{0af2a4aa-8fed-4f8d-b67b-c903658118f8}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{3204e935-260e-4735-bd2b-073829f29034}</UniqueIdentifier>
+      <UniqueIdentifier>{e8955c47-48b6-4bdd-a5c9-9053145e8b99}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{253ab061-1355-4464-8d75-1bc312083677}</UniqueIdentifier>
+      <UniqueIdentifier>{d4767c4a-cf2a-48b3-9ce4-07a1c1794ba4}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{89f5eb92-90d5-4017-8266-deeba57f38c4}</UniqueIdentifier>
+      <UniqueIdentifier>{aab994b7-23fa-47ed-85f1-b97557181a73}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{fc31dd8f-d31a-4760-9dc8-568fde5fcf64}</UniqueIdentifier>
+      <UniqueIdentifier>{1bac6d2a-ad47-46de-94a4-e4af8308af87}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{b83495da-2b73-4ec0-afc4-a1c71888864e}</UniqueIdentifier>
+      <UniqueIdentifier>{68f33cec-90de-4ec3-af65-16632fd0512f}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{606ba02f-782f-4a91-acdd-86d7b25da55c}</UniqueIdentifier>
+      <UniqueIdentifier>{7cd396a3-6b64-4b52-9d54-43a28dddb4e2}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{4aa73fb5-cda7-4fdc-be84-92225c315d3a}</UniqueIdentifier>
+      <UniqueIdentifier>{9bbeabd6-b4bc-468e-8e2a-9edf0a509ec6}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{ceca51e3-2b82-4172-831f-d5d498bf7d12}</UniqueIdentifier>
+      <UniqueIdentifier>{69fdebad-07c6-42c6-8c04-79783c8d5064}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{1a014a2d-b909-486f-9021-42c958c88135}</UniqueIdentifier>
+      <UniqueIdentifier>{44a157b5-d045-4f6f-a415-f379b8526555}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{a58f9a29-fc53-4316-ad04-53b157dc1842}</UniqueIdentifier>
+      <UniqueIdentifier>{e98c9670-dc1f-4825-b856-99ced7d4e7b5}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{d7af737c-55d4-4744-ada5-ae21dca91551}</UniqueIdentifier>
+      <UniqueIdentifier>{506d3bf7-a5be-4cce-91c2-824b734ab586}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{bff62639-0e2c-426a-85c3-91df2cbd174b}</UniqueIdentifier>
+      <UniqueIdentifier>{5d481ab0-b60c-4500-9b10-46b308fb40f4}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{a80b35b7-1aaf-4067-a780-d0c1c93c73ff}</UniqueIdentifier>
+      <UniqueIdentifier>{b81f7d5e-2ebb-47df-acc2-338727fbedd1}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{75411303-b933-4e7b-b1cf-8c147ca0a345}</UniqueIdentifier>
+      <UniqueIdentifier>{7474effe-0af2-4cda-a02b-315d982b7e66}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{46c9a9ca-38f8-4732-bc41-0339322f433c}</UniqueIdentifier>
+      <UniqueIdentifier>{13b3f50c-b73c-4647-b5cf-bbb98a4c7f67}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{0d1cd85e-265d-435b-a144-5c6d2781ce7d}</UniqueIdentifier>
+      <UniqueIdentifier>{677b7583-b98a-4de2-9cd5-3a9e67fcf29d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{196936d5-0c96-4391-b54a-eb247bd0fa09}</UniqueIdentifier>
+      <UniqueIdentifier>{ac766cd0-80d1-4b8f-9a51-ff84c34133d9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{c32ad16c-dcd8-4848-82c6-14bd98305084}</UniqueIdentifier>
+      <UniqueIdentifier>{7eb9a24e-292f-4a14-b6b2-04ac12ea012f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{e30442c4-2fd2-4145-bfd6-29ad0b6dfd8e}</UniqueIdentifier>
+      <UniqueIdentifier>{66cf971b-6177-4156-a01b-8cfe6d117109}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{459a4d69-f197-4762-b1d3-5a37c920e276}</UniqueIdentifier>
+      <UniqueIdentifier>{17d7ad49-1912-492f-bf32-fb09409519e7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{cc61c5a1-0158-4ee7-aceb-585878a990ca}</UniqueIdentifier>
+      <UniqueIdentifier>{ba4500d9-f027-4e19-8c83-3b96360ffc08}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{abf6732c-0e23-4c0e-9a18-31002926a5b6}</UniqueIdentifier>
+      <UniqueIdentifier>{a847857d-b45d-40e7-95aa-932a44b95914}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{8d246811-767c-4b6b-b209-f885cfb3aea9}</UniqueIdentifier>
+      <UniqueIdentifier>{f7f4fed2-4754-444c-bdc1-cb285703ba0d}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{8af8f963-820c-49fb-a0a0-9fc68fec2d23}</UniqueIdentifier>
+      <UniqueIdentifier>{de5f70fd-f4ca-4957-a730-f87e39f92f33}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{734cc281-21f5-4577-ad8e-04d9cd21a76d}</UniqueIdentifier>
+      <UniqueIdentifier>{b7c94944-b633-4f9f-ad6a-60e6ce9bf280}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{09ea8b28-b73c-4a46-a639-62ea4ec76233}</UniqueIdentifier>
+      <UniqueIdentifier>{24aee057-ee5b-4858-9be4-503d455f7f0e}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{0fe85948-34c8-46f0-a682-fdd37367039d}</UniqueIdentifier>
+      <UniqueIdentifier>{0c1ef48f-f868-4d83-9174-4c9027ab8cdf}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{3b770e03-ccd6-426b-a341-425e757bacd1}</UniqueIdentifier>
+      <UniqueIdentifier>{72dc58e4-cd0d-49cd-9767-5e03f63b3c91}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{c27b6618-b5ba-4187-bcfb-37d280408b31}</UniqueIdentifier>
+      <UniqueIdentifier>{cd87b192-ab0b-4072-807b-e653135d053c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{2df00f6a-0ca9-4ca1-a741-178eb0d5245e}</UniqueIdentifier>
+      <UniqueIdentifier>{a033a887-4add-4cd3-9303-16939fa68cf9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{f54ab8a4-30ba-42c2-b39f-0a42cc487965}</UniqueIdentifier>
+      <UniqueIdentifier>{45d338b4-e4e6-4b2a-b5db-5e6748dd8f3c}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{3914a50e-2ec7-42cc-bab1-1f6cbd1fd068}</UniqueIdentifier>
+      <UniqueIdentifier>{7968aed7-9ad6-4d18-8077-93d1db12e9fc}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{a9045b65-ce0f-4143-8608-0df94bed0dc2}</UniqueIdentifier>
+      <UniqueIdentifier>{2d011071-cdf9-4d1b-8fc0-90bb7498213d}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{63e53517-5881-4994-984d-9d90d726a6b6}</UniqueIdentifier>
+      <UniqueIdentifier>{1032b803-72a8-4684-8c46-0292deafdfd6}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters
index e2fa87ae7..4d946179d 100644
--- a/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters
+++ b/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters
@@ -2,154 +2,154 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{bbd07028-a7df-42d4-9a2e-0081eeefde14}</UniqueIdentifier>
+      <UniqueIdentifier>{71a39f9f-14aa-450d-9cf8-8607b1bc0a50}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{55b7d087-9d6c-4753-b3d7-afd99ae43e2d}</UniqueIdentifier>
+      <UniqueIdentifier>{fa02430a-f37d-44e4-b895-d21fafd54335}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{d2881035-8cfe-4201-aa96-0801def520cd}</UniqueIdentifier>
+      <UniqueIdentifier>{24396f54-83d1-446f-8454-8595e5933792}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{8fd99951-1231-406f-9b3b-e822a454841f}</UniqueIdentifier>
+      <UniqueIdentifier>{31e32065-10a8-4261-80fa-8ad12b64ad42}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{4efb0c16-d87e-4f5a-bb21-9539272a3b48}</UniqueIdentifier>
+      <UniqueIdentifier>{f34ba135-0b96-4408-92f3-fd8988d73679}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{d96f51bc-3a7c-41a7-8064-43498ea38275}</UniqueIdentifier>
+      <UniqueIdentifier>{86bf1f65-4758-45b6-847e-ef0f4439f1d0}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{bd3e669c-83f0-4c11-bceb-74a6c905805c}</UniqueIdentifier>
+      <UniqueIdentifier>{ca498196-f2b5-4933-9c27-cb8870f6cb6e}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{4f4f1c1b-e6f2-4dd1-9fd2-3f934e1aebbb}</UniqueIdentifier>
+      <UniqueIdentifier>{df326087-32c2-49af-9a72-01fdc00167be}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{f855edd4-c8e9-4034-9bac-19ef3a374972}</UniqueIdentifier>
+      <UniqueIdentifier>{3d36ec0a-b9d7-426e-9135-4defc952d4e6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{4ad183dd-1762-4fc8-a4e2-f359476d0e1d}</UniqueIdentifier>
+      <UniqueIdentifier>{890b25a2-6f88-4fc4-b53b-e04dfd7501cc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{bac658d7-c473-415a-bd60-e5d296879510}</UniqueIdentifier>
+      <UniqueIdentifier>{000d4318-f2fc-4e96-a324-14e415c1bac6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{1c4252ea-0808-4b35-82b1-857f71dcdeb4}</UniqueIdentifier>
+      <UniqueIdentifier>{ae753e84-4481-4185-bf34-78a393af6d98}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{68349a96-ce83-42a9-b670-0115c7be0ad7}</UniqueIdentifier>
+      <UniqueIdentifier>{39920552-27a6-4d9e-be0f-100469e457f3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{0c9b2c33-a3a7-4994-892b-e6cd9982e0fa}</UniqueIdentifier>
+      <UniqueIdentifier>{561d0990-ad3b-481f-a909-81573c2043a9}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{a0960cd4-dc74-4c5b-945d-7797bc48a667}</UniqueIdentifier>
+      <UniqueIdentifier>{2d3929f7-0adf-49d3-be27-222530b103e6}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{b096430f-5ae0-448f-8cb5-d8d7f7d5581a}</UniqueIdentifier>
+      <UniqueIdentifier>{6913f97a-b27c-425b-9cb3-351515b0b4c4}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{8f9c68b9-c4cc-431c-9e29-d51ab558ada1}</UniqueIdentifier>
+      <UniqueIdentifier>{58b3707a-57f5-4ad7-8c33-c5b42deaad80}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{1b3a7631-544d-4f25-8a50-4083bc45b14c}</UniqueIdentifier>
+      <UniqueIdentifier>{479ed1c2-20b2-4193-a94e-a51774a90512}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{ca3b66d2-66f9-404b-a518-0c0629e003cb}</UniqueIdentifier>
+      <UniqueIdentifier>{e8778520-2080-4e15-acd7-44102d67e5ec}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{061d8b74-2c58-4f35-aff8-5367964dc849}</UniqueIdentifier>
+      <UniqueIdentifier>{a301cb17-bd18-49f2-bd4d-1949f1bcf581}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{3a733e35-8d2d-47da-a1ce-7eec8d494ca6}</UniqueIdentifier>
+      <UniqueIdentifier>{ce4d69e9-c44e-4b1f-b87a-ffd0ff71d353}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{5c1a44f0-c6c2-400c-b985-6ded7b34057c}</UniqueIdentifier>
+      <UniqueIdentifier>{05c47d2a-fff0-48a7-82f8-5a207ae597bc}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{53aabef3-464f-432c-a91f-c630a1728bc6}</UniqueIdentifier>
+      <UniqueIdentifier>{ae7e978e-7f35-4987-bd89-e070647151e1}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{d33491e8-61ec-47fd-84e1-b60a6e18feef}</UniqueIdentifier>
+      <UniqueIdentifier>{5387e850-4f6a-493d-affd-c60ae3dbe17b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{24a3ce5d-9ff1-42ce-88ab-f0a19da4ef05}</UniqueIdentifier>
+      <UniqueIdentifier>{78556b2a-1a71-4191-88f3-4ce1a496a9a3}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{c16c0625-e0d9-4e30-9826-e9243f92222b}</UniqueIdentifier>
+      <UniqueIdentifier>{500590f3-01ae-4e26-a368-662b210595a3}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{ef9c421b-14b5-4bdb-86e8-964bb0a57b08}</UniqueIdentifier>
+      <UniqueIdentifier>{fe1a3b34-0fe2-4fa6-bc63-531ec8fa71a8}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{1d85bbdc-74fd-4f3f-9a85-d712dffd7101}</UniqueIdentifier>
+      <UniqueIdentifier>{683164db-a668-4582-a545-f483a848b0a7}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{d0ac63bc-addb-494a-b780-a590d81f206d}</UniqueIdentifier>
+      <UniqueIdentifier>{15ab0388-7f46-4011-9881-26f938ea54a6}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{25634c7f-1a3d-4c0e-89f8-df3bd3cbafe4}</UniqueIdentifier>
+      <UniqueIdentifier>{34b2a653-6201-4955-8883-252118648abd}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{6eaa046f-efb5-4586-871c-77bb07a70b42}</UniqueIdentifier>
+      <UniqueIdentifier>{b79a4bef-5637-4123-9619-78f0f37b0446}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{c7e76419-cfd7-40ce-ab1d-95e8567f5d56}</UniqueIdentifier>
+      <UniqueIdentifier>{67f14e7b-b920-4d74-926d-1d2a6daa65ce}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{14c436e5-a9d6-43fe-9071-81baf2789753}</UniqueIdentifier>
+      <UniqueIdentifier>{77ffc072-0484-4f42-aada-b1bd2f42111a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{5d98a975-e10f-4d10-8b98-472c55751418}</UniqueIdentifier>
+      <UniqueIdentifier>{6a847ca3-04da-4a58-a195-3a36c7f74b20}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{99b797b8-f54c-468e-9a1a-1016118354df}</UniqueIdentifier>
+      <UniqueIdentifier>{6d4d0c65-d700-4c10-ae1a-4f4c58be9f86}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{2d203d04-4b25-419a-af1c-b280761c2242}</UniqueIdentifier>
+      <UniqueIdentifier>{a1c42aac-8b9e-4bd0-b410-d619d02ca1da}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{02dac707-f85b-40d9-945b-6af752bc8350}</UniqueIdentifier>
+      <UniqueIdentifier>{1d004876-bf79-4d97-8ce4-5fc0d5711e1f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{deebffd4-833b-4952-9424-078d83d8ba78}</UniqueIdentifier>
+      <UniqueIdentifier>{76785037-936c-40f7-ad4d-e2a53586a526}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{a095fea8-d7d4-46d9-91eb-7f6a02f28d78}</UniqueIdentifier>
+      <UniqueIdentifier>{c861a961-66a9-4ceb-beb9-b95e89c875dc}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{62d0d1f8-21e4-4ff5-ab57-d06a14280cc4}</UniqueIdentifier>
+      <UniqueIdentifier>{f79264fe-3731-4513-be4e-afa431e2fe19}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{02d52b00-3d12-45a8-ba30-05e18ecd72b1}</UniqueIdentifier>
+      <UniqueIdentifier>{348b1d12-ffa1-4fa8-b095-72c18cc552a4}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{e49ebf49-da45-4fb3-85b1-8ad3b95725de}</UniqueIdentifier>
+      <UniqueIdentifier>{cf2ec8b8-847b-420d-9731-8ab90998038f}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{7fcb8c7d-ed39-4b85-8134-5602bb070a09}</UniqueIdentifier>
+      <UniqueIdentifier>{e2872a84-32eb-46a3-8bc8-539468419639}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{33af4ff1-d65f-48be-83fd-79ba1934462d}</UniqueIdentifier>
+      <UniqueIdentifier>{32b244d7-8824-4071-ab9b-03df23785f18}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{26b2ea08-ebac-440f-b892-ba2611794d2c}</UniqueIdentifier>
+      <UniqueIdentifier>{4c2bb1e9-49df-4528-b51a-4fe6fb1866c0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{34af4549-b3b8-429a-bf72-6d3c27bfe083}</UniqueIdentifier>
+      <UniqueIdentifier>{957ad320-6d84-451c-b6a9-11694b72f02f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{9b73f6f0-6e13-4dfb-b4ba-6bf60c5c2b6c}</UniqueIdentifier>
+      <UniqueIdentifier>{7a88656b-af16-444c-96bc-4b94e5d28fee}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{8dc7169d-70c0-42da-9679-8780fb04dfa3}</UniqueIdentifier>
+      <UniqueIdentifier>{b62ad731-b9f9-4f4f-9b07-1160e53bacfe}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{3ca3ccae-9102-45cb-85e8-ad79cbb35eb3}</UniqueIdentifier>
+      <UniqueIdentifier>{6835331b-41d1-4893-b3f7-b4638e08792e}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{55751300-1ed7-4393-a63b-063fd63eb6a0}</UniqueIdentifier>
+      <UniqueIdentifier>{bbbfe319-13fe-4bce-839b-e005ade128ee}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/Net/testsuite/TestSuite_x64_vs110.vcxproj b/Net/testsuite/TestSuite_x64_vs110.vcxproj
index ce503219b..c998c08c3 100644
--- a/Net/testsuite/TestSuite_x64_vs110.vcxproj
+++ b/Net/testsuite/TestSuite_x64_vs110.vcxproj
@@ -91,7 +91,25 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">bin64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">obj64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">bin64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">obj64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">bin64\static_mt\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">bin64\static_mt\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">bin64\static_md\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">obj64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">bin64\static_md\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">obj64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">false</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">TestSuited</TargetName>
@@ -99,36 +117,6 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
-    <OutDir>bin64\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
-    <OutDir>bin64\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
-    <OutDir>bin64\static_mt\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
-    <OutDir>bin64\static_mt\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
-    <OutDir>bin64\static_md\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
-    <OutDir>bin64\static_md\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -146,6 +134,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -177,6 +166,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -206,6 +196,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -238,6 +229,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -268,6 +260,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -299,6 +292,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters
index 685560ae4..d02c8ecc6 100644
--- a/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters
+++ b/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters
@@ -2,154 +2,154 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{46620d72-21f6-49e6-a78f-a9627cd23930}</UniqueIdentifier>
+      <UniqueIdentifier>{dbdf122b-4406-409e-8507-f87ca3e0a905}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{5ab45996-4070-444f-a783-974b1dd17019}</UniqueIdentifier>
+      <UniqueIdentifier>{5d534ca1-c6c9-4c96-bb27-acd6a82d76c8}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{83c99480-9e70-492f-9689-7149757d6304}</UniqueIdentifier>
+      <UniqueIdentifier>{018079b6-1760-4225-87ac-7e3834da1397}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{0a4eda59-429d-4667-8906-5ec739729c26}</UniqueIdentifier>
+      <UniqueIdentifier>{0c6ed02b-7bfd-4edf-bfbe-8c71a34716f9}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{fed9e397-ed33-4aae-a4af-7ea7e0c6ce7d}</UniqueIdentifier>
+      <UniqueIdentifier>{5d1d8369-ef69-40a8-8c54-112b777ce59a}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{9dcf0667-6d6d-48fd-88a5-5bbd988e8a11}</UniqueIdentifier>
+      <UniqueIdentifier>{2f1dc202-a39c-49b1-abb2-f20010190a09}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{65b28fdd-4535-4d36-8e94-766dc9ef1414}</UniqueIdentifier>
+      <UniqueIdentifier>{c3694c82-e395-4fe2-b447-535c0cf8d28b}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{045436be-49a6-48da-a803-916c65d58f27}</UniqueIdentifier>
+      <UniqueIdentifier>{2e85d79b-1a1f-4d4b-a2a2-55d5be6816e8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{e01bff15-d6a0-4647-859a-a2b3667d486b}</UniqueIdentifier>
+      <UniqueIdentifier>{d6cf92c2-1b01-44a8-97ec-bc37b46837b2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{44bb1098-0ea3-4077-9373-b65dc2e588b6}</UniqueIdentifier>
+      <UniqueIdentifier>{3dcfca06-39ec-403f-b6d1-ba05578fe53e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{0a7e55ac-b815-4c0e-a6cd-cfd55a65e2c3}</UniqueIdentifier>
+      <UniqueIdentifier>{848048a0-78b8-4f8e-9976-d0272eaaee1c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{0fbb597a-99c5-4e27-8c8b-be2f2dcd79a8}</UniqueIdentifier>
+      <UniqueIdentifier>{ef2262f8-3450-42f2-bc10-aed1d7d35e61}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{a902d8a4-b923-46cb-bd61-19ce8b751f10}</UniqueIdentifier>
+      <UniqueIdentifier>{266d977c-ad91-4758-9f95-b3e9169cd342}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{f75cfcbc-8596-4dc7-87a7-703e239431c2}</UniqueIdentifier>
+      <UniqueIdentifier>{ef3e3399-8737-4911-8fbe-3b19b1bf0795}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{5f0a7e08-e841-4daf-a914-c08f0954ab36}</UniqueIdentifier>
+      <UniqueIdentifier>{e3461ba9-7293-4709-834d-a172ce69f627}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{a959d14a-007a-4e61-8ae6-325525cd58e2}</UniqueIdentifier>
+      <UniqueIdentifier>{8a0a3b39-3641-4e25-bde6-7d6fc5ec045e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{599b8c64-d609-4f1f-89cd-e662a6703c44}</UniqueIdentifier>
+      <UniqueIdentifier>{7b56a149-d4f9-43ed-8812-acb3da98ad71}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{2774794c-62e1-4d4a-ae34-89553fdd7d87}</UniqueIdentifier>
+      <UniqueIdentifier>{6b4972dc-5480-473c-8c45-fadf32346a23}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{272241b3-58b3-4956-8c52-0909f002f386}</UniqueIdentifier>
+      <UniqueIdentifier>{663e66f2-6649-48db-a4e2-d62fa2135757}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{c874f64e-46fd-4c58-a1d4-7a56293362c0}</UniqueIdentifier>
+      <UniqueIdentifier>{ca9a13cd-b0d8-45a8-a03f-b7a0c0e17e56}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{7bc28830-964f-4b82-afad-442ba0c20834}</UniqueIdentifier>
+      <UniqueIdentifier>{fe11ad74-0883-4dd7-82b7-a58366ccae9b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{7dfe4cec-25a6-4d41-87fe-c5b31580d029}</UniqueIdentifier>
+      <UniqueIdentifier>{9b35f686-523f-4071-90a3-2525b95a8c00}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{45dd5425-48f7-4613-93a5-d143e16b3289}</UniqueIdentifier>
+      <UniqueIdentifier>{8fc45a6d-243a-4091-b6c2-34f3c058d0ab}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{5f17fcc8-b9c8-444e-9cb2-ff532d2986ba}</UniqueIdentifier>
+      <UniqueIdentifier>{50d484f0-7e4e-4c36-9d04-ac9e30aa291f}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{e8ef3e5e-7925-450b-9607-89593b2863e6}</UniqueIdentifier>
+      <UniqueIdentifier>{68afc91b-1893-4f6c-99d3-100888a95f73}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{2729c97a-2fce-4a9f-9776-a2113f8244c9}</UniqueIdentifier>
+      <UniqueIdentifier>{336ad142-4813-45c5-bb64-11bc503fc367}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{71d61c72-0bac-42aa-b8e4-96603ded4e86}</UniqueIdentifier>
+      <UniqueIdentifier>{6e2eab65-4c9e-47b2-b205-5fea56bbba19}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{9cdb1e20-7e62-4b19-bb62-396accfd6808}</UniqueIdentifier>
+      <UniqueIdentifier>{9f6da584-6d35-4404-b4dc-b46c24f5f8bb}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{dc8839c2-0e33-4099-b5b2-7bce63ab6ae4}</UniqueIdentifier>
+      <UniqueIdentifier>{34fccadc-3ad9-441d-a3c8-88ce355ea2d4}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{af82bbbc-f960-406a-901f-bfb6f5d9416c}</UniqueIdentifier>
+      <UniqueIdentifier>{3f324999-2395-4046-bea9-d65e65a8e0f7}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{ab7273f3-a075-4d84-9b4a-d419f803417e}</UniqueIdentifier>
+      <UniqueIdentifier>{020e8a89-ab2f-41b3-b5fb-afa3a3258254}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{86fe84eb-c099-4315-9959-b4bd8422a1e6}</UniqueIdentifier>
+      <UniqueIdentifier>{6941065a-0931-4a99-87d0-5b0d1f4dba67}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{0436b459-dee6-499b-80aa-22f079fbed98}</UniqueIdentifier>
+      <UniqueIdentifier>{116b64c5-4aa4-40cc-872d-8ea46a9af2df}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{e8230279-643f-401a-a57d-818773d44ec5}</UniqueIdentifier>
+      <UniqueIdentifier>{f47a7a36-d7ff-4473-a45d-d2c9f42303f4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{0ef2d4e0-44ac-405c-aa77-aee11712ae20}</UniqueIdentifier>
+      <UniqueIdentifier>{d22d921b-d92f-4faf-9fea-f6f546c5d96e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{e0f241c4-4f6d-4157-992a-fc32a6601b38}</UniqueIdentifier>
+      <UniqueIdentifier>{7c937269-07c1-4f20-9855-327dbc517706}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{4dc84ebe-11ea-4b6d-b06a-5f2f8b0492c0}</UniqueIdentifier>
+      <UniqueIdentifier>{913af466-2af7-460b-8e38-4cda90aad99e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{b3dd6dac-b360-4275-bbd6-aa335029afb8}</UniqueIdentifier>
+      <UniqueIdentifier>{d96cd30d-d57c-43e1-a68c-0ab29c33e4e8}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{3ba08410-d6db-4d61-8fbf-0dbee61dba06}</UniqueIdentifier>
+      <UniqueIdentifier>{6cd5aa70-7f88-4336-bacb-bba3e2d4de48}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{66ebf194-8b92-4113-9508-7b8d8e033b2f}</UniqueIdentifier>
+      <UniqueIdentifier>{2708176a-e090-4d6a-b841-b6cdddc69228}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{09fe8801-6cc2-4aa6-b8ce-41f741741451}</UniqueIdentifier>
+      <UniqueIdentifier>{600bc71f-6af1-4f82-aea8-da3cc23c07ab}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{9947e15b-e453-4d1d-ac00-27281bf5e092}</UniqueIdentifier>
+      <UniqueIdentifier>{d718b524-e93c-44f9-b1e9-a91456db7eb1}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{628dd549-3535-4346-ba67-36108948c109}</UniqueIdentifier>
+      <UniqueIdentifier>{324d4033-5395-47dd-9595-25c315b415b5}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{dd1043e5-3494-4254-98d2-9cb380fb5899}</UniqueIdentifier>
+      <UniqueIdentifier>{a9fe0943-ca72-4be4-94e9-97675c7cf00a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{4524def8-e693-4a86-b293-3f7ebc342d65}</UniqueIdentifier>
+      <UniqueIdentifier>{6bf84235-007b-49f8-82e6-b9effe6aee16}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{fbbcc33c-654a-4279-bbf5-ac6153a9d4cc}</UniqueIdentifier>
+      <UniqueIdentifier>{cc892692-ef3c-456f-b719-4d3805e91e1b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{c9cf4a0a-e910-47bc-9633-752a1b9c344a}</UniqueIdentifier>
+      <UniqueIdentifier>{8e6433e0-0198-4cf1-8125-02ecdbda68ca}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{97a18bcb-f6d2-4c26-b78d-ffee65a10fa5}</UniqueIdentifier>
+      <UniqueIdentifier>{62bbafbc-e820-44b3-93cf-3372b7047a43}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{97a4d62e-8fd6-499f-a9ee-d2d0e1fe6039}</UniqueIdentifier>
+      <UniqueIdentifier>{6f120423-3729-49fe-9de3-860394eb05af}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{2d11ffc9-e75f-46f8-a1f5-f7b88ef0f884}</UniqueIdentifier>
+      <UniqueIdentifier>{d71d4448-6d7b-4585-a5d2-b8bc1785c967}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/Net/testsuite/TestSuite_x64_vs120.vcxproj b/Net/testsuite/TestSuite_x64_vs120.vcxproj
index 6e6c59f24..801d022dc 100644
--- a/Net/testsuite/TestSuite_x64_vs120.vcxproj
+++ b/Net/testsuite/TestSuite_x64_vs120.vcxproj
@@ -35,31 +35,37 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
@@ -85,7 +91,25 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">bin64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">obj64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">bin64\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">obj64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">bin64\static_mt\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">obj64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">bin64\static_mt\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">obj64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">bin64\static_md\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">obj64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">bin64\static_md\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">obj64\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">false</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">TestSuited</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">TestSuited</TargetName>
@@ -93,36 +117,6 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
-    <OutDir>bin64\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
-    <OutDir>bin64\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
-    <OutDir>bin64\static_mt\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
-    <OutDir>bin64\static_mt\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
-    <OutDir>bin64\static_md\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
-    <OutDir>bin64\static_md\</OutDir>
-    <IntDir>obj64\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -140,15 +134,16 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -171,13 +166,14 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX64</TargetMachine>
@@ -200,15 +196,17 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -231,13 +229,15 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX64</TargetMachine>
@@ -260,15 +260,16 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -291,13 +292,14 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat/>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX64</TargetMachine>
@@ -369,7 +371,7 @@
     <ClCompile Include="src\NetworkInterfaceTest.cpp"/>
     <ClCompile Include="src\SocketAddressTest.cpp"/>
     <ClCompile Include="src\NetTestSuite.cpp"/>
-    <ClCompile Include="src\Driver.cpp"/>
+    <ClCompile Include="src\WinDriver.cpp"/>
     <ClCompile Include="src\DatagramSocketTest.cpp"/>
     <ClCompile Include="src\DialogServer.cpp"/>
     <ClCompile Include="src\DialogSocketTest.cpp"/>
diff --git a/Net/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs120.vcxproj.filters
index 85ccf5312..89d18b9f9 100644
--- a/Net/testsuite/TestSuite_x64_vs120.vcxproj.filters
+++ b/Net/testsuite/TestSuite_x64_vs120.vcxproj.filters
@@ -2,154 +2,154 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="NetCore">
-      <UniqueIdentifier>{c94d6394-402e-40e3-b93a-81073d093f7f}</UniqueIdentifier>
+      <UniqueIdentifier>{c4f41591-7632-4829-9139-f51528c26bf7}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{7b58dc54-3231-40ff-9e8e-90b3618b5e25}</UniqueIdentifier>
+      <UniqueIdentifier>{20711996-a57b-4e3c-821b-23aaca79a2d8}</UniqueIdentifier>
     </Filter>
     <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{e79e47c0-cf29-4d84-820e-57351575b81c}</UniqueIdentifier>
+      <UniqueIdentifier>{42287272-0646-48c8-8249-feaedb0f1bef}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{9f985b13-7592-458e-b589-a056462d71c6}</UniqueIdentifier>
+      <UniqueIdentifier>{8c385b46-e444-4d66-b934-bc965ec0538d}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{a0e88b04-0a97-4674-9ab5-089f6a9e8e4a}</UniqueIdentifier>
+      <UniqueIdentifier>{b8c1c2dc-ffba-4456-8361-b64f51ac8c3b}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{508af6b6-1582-4cd0-8ad5-dd54339bd0ad}</UniqueIdentifier>
+      <UniqueIdentifier>{844bd14a-5cb6-481d-b75d-890dd87d68da}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{8d0d6350-1ed4-482a-a0d4-cd821ea46b68}</UniqueIdentifier>
+      <UniqueIdentifier>{c0d1ca35-9726-4d23-901c-4c1b79dc0cb1}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{dec504e1-19ca-45ae-ad68-2d501800b592}</UniqueIdentifier>
+      <UniqueIdentifier>{8b2348b9-4652-40d6-8d01-69643eee84b9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets">
-      <UniqueIdentifier>{f9fb2527-08ca-4991-82c9-4d4a84deff06}</UniqueIdentifier>
+      <UniqueIdentifier>{ca335cc5-ce72-497d-a5bd-94cae13a320b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{6f8f6e61-52c0-449a-8e1a-7621c5e3a2b9}</UniqueIdentifier>
+      <UniqueIdentifier>{2aeee67f-ffc2-4c66-8a48-43298a4a09b9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{bd9e3792-b356-40f0-b304-cabab361e8a3}</UniqueIdentifier>
+      <UniqueIdentifier>{6f57dec6-8fdb-4a7d-8493-6372369a80bf}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages">
-      <UniqueIdentifier>{b92a7937-1610-4386-a8eb-ece48e9a0adb}</UniqueIdentifier>
+      <UniqueIdentifier>{76e8c738-e7da-4611-906a-69f9f52e5cc3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{1056b86d-2c3e-4ffd-b000-36968a86fa0c}</UniqueIdentifier>
+      <UniqueIdentifier>{cc061754-4c49-4337-b7e4-794a86b51830}</UniqueIdentifier>
     </Filter>
     <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{50222b8d-5d0e-44a8-9709-d2cf8e8acd6a}</UniqueIdentifier>
+      <UniqueIdentifier>{a7b1081f-ccad-4b35-a2ed-4b32dcf95893}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP">
-      <UniqueIdentifier>{219fc0af-3a97-495b-9461-c9ae4ecb13f4}</UniqueIdentifier>
+      <UniqueIdentifier>{385193d5-57d3-4c36-b458-0ee3cf79b6eb}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{8c0b9fa9-f0a5-4da6-8439-d18da22b6493}</UniqueIdentifier>
+      <UniqueIdentifier>{07fb5fe9-9b1b-4e5a-9946-8cfe94d32fe0}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{6e58985a-daef-4fe6-b3b0-773022cb336f}</UniqueIdentifier>
+      <UniqueIdentifier>{31b10ae5-2068-47eb-8776-0dd06b0fcf98}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer">
-      <UniqueIdentifier>{75024ed4-abc4-4679-9db1-73148f422952}</UniqueIdentifier>
+      <UniqueIdentifier>{b5fac643-135a-41ba-9cc0-98c7ba40a73e}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{0b1ad7e9-c50d-45a5-b237-a05a9f5e1743}</UniqueIdentifier>
+      <UniqueIdentifier>{eb3f2918-a111-4d6e-8a6b-3efa0cecea82}</UniqueIdentifier>
     </Filter>
     <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{42aa238e-93b5-4afc-b770-506dc5b09628}</UniqueIdentifier>
+      <UniqueIdentifier>{35aff390-6009-4ca3-8e15-03065fed704a}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer">
-      <UniqueIdentifier>{bca99ecc-e216-4b20-a81c-bf3ff255f76a}</UniqueIdentifier>
+      <UniqueIdentifier>{b8f49ceb-188a-454c-9486-ba76edb26ea4}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{89638577-1d64-4995-b370-ef27604c8674}</UniqueIdentifier>
+      <UniqueIdentifier>{c38316d0-a972-48bb-8c4e-5ffa8015bd70}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{c71f3143-2bf3-41a0-96fe-aaa330220588}</UniqueIdentifier>
+      <UniqueIdentifier>{c59d0632-15c4-42b6-8fbb-70c9af2cace1}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML">
-      <UniqueIdentifier>{af99916f-b7e5-42fa-bebe-51cf7755a8a9}</UniqueIdentifier>
+      <UniqueIdentifier>{61350238-1303-49e1-a6d9-4a5c0750fe95}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{d453c80d-0ca1-4a76-9f2a-cbeec00fe557}</UniqueIdentifier>
+      <UniqueIdentifier>{34e2efb9-bd4e-46fd-b3af-6c65fb48ca96}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{d054d029-3159-4dae-a336-c8dd004dd7e7}</UniqueIdentifier>
+      <UniqueIdentifier>{4dbf3919-1ad7-4323-b6bc-eedfd394813d}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient">
-      <UniqueIdentifier>{a64c6fcd-2444-4843-9955-209c397e2569}</UniqueIdentifier>
+      <UniqueIdentifier>{4a971d20-2915-41dc-8932-2b73e60f5bc0}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{c1091f57-a3d9-4e0b-aa88-8a457fd78321}</UniqueIdentifier>
+      <UniqueIdentifier>{11d87418-63f7-4bef-8f35-8ba3a630466f}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{45a26252-c64e-4cb6-bdbd-8051b0fe520e}</UniqueIdentifier>
+      <UniqueIdentifier>{e0d6a508-b3bb-420d-96f9-877a81931f2a}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient">
-      <UniqueIdentifier>{87a12d76-e746-49e0-b7ea-494c6c545874}</UniqueIdentifier>
+      <UniqueIdentifier>{2114af0a-ae3b-47b7-8f08-9c554660fc16}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{ea9049ae-c04a-418f-bc18-8d3ffc5babd2}</UniqueIdentifier>
+      <UniqueIdentifier>{6b8e1606-80ea-42bb-a328-d228f397a414}</UniqueIdentifier>
     </Filter>
     <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{cb047819-013b-4603-9f5b-70f4ecc322df}</UniqueIdentifier>
+      <UniqueIdentifier>{91467824-a83c-4429-84a8-9c9ea4d93928}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor">
-      <UniqueIdentifier>{072a8303-e7f0-45d3-8cec-24430bb5e5ac}</UniqueIdentifier>
+      <UniqueIdentifier>{0dd89764-b3d4-48ea-a761-758620e7f9f3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{306bdc98-7e31-44dd-bb87-ae5ae7077900}</UniqueIdentifier>
+      <UniqueIdentifier>{33251821-160e-4f27-ac83-87ef70194c45}</UniqueIdentifier>
     </Filter>
     <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{813dccea-82be-4ee1-881e-2d589f63d3b6}</UniqueIdentifier>
+      <UniqueIdentifier>{fe05168f-51fb-48c5-a8b4-31a4c6f2753e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{4a470da4-e069-486e-a3fd-fbe5e8a79297}</UniqueIdentifier>
+      <UniqueIdentifier>{cfff683b-2ee1-4ad9-beba-f068d0fe0bc0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{8b13fc05-4cdd-4cf2-8d0b-f693f2e731ca}</UniqueIdentifier>
+      <UniqueIdentifier>{4ff8436e-0983-471d-8729-eff6789b4551}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{709d3738-fb5c-40e8-8c87-e1b0f2c5a2bc}</UniqueIdentifier>
+      <UniqueIdentifier>{9498a8d4-4480-47b3-a9cc-8cb5820d2476}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP">
-      <UniqueIdentifier>{4eeaba04-779a-49e5-8a47-4f4501e4fc4e}</UniqueIdentifier>
+      <UniqueIdentifier>{16f039d1-463a-431a-8627-c5bec2cb1037}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{e8db5d32-acd2-4e52-935a-f591fcb32bf9}</UniqueIdentifier>
+      <UniqueIdentifier>{27207ab4-d30d-44eb-b0ed-d9af17c13710}</UniqueIdentifier>
     </Filter>
     <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{16fd29a3-45af-4717-8cc5-326dad6196d0}</UniqueIdentifier>
+      <UniqueIdentifier>{015e634f-4d47-4ebc-b8a9-16d2c322a11a}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP">
-      <UniqueIdentifier>{f45bc672-806c-4236-9172-27cd30883b6a}</UniqueIdentifier>
+      <UniqueIdentifier>{1cb0f2e4-28d4-42fd-827c-f8dae1ba18be}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{e135ebef-6de0-4126-9821-ff479ec7bf1b}</UniqueIdentifier>
+      <UniqueIdentifier>{bd96f916-d5d8-4654-9434-3f75c853f98d}</UniqueIdentifier>
     </Filter>
     <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{49d50539-34de-4790-8ff1-98097280264a}</UniqueIdentifier>
+      <UniqueIdentifier>{4b076363-839b-43a1-9b6e-cfc37b384ea9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging">
-      <UniqueIdentifier>{ce0b83b4-25df-47cb-afc2-67bc1be468c1}</UniqueIdentifier>
+      <UniqueIdentifier>{eefc6e19-1b3e-4733-b910-8e4554e1bbb3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{a9a62400-f050-4ae9-a7a1-0c776f3b92be}</UniqueIdentifier>
+      <UniqueIdentifier>{4442f5aa-a1db-42dd-b88f-6431ffb1c745}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{d83b8da6-eb3e-4127-ac81-98a93fafa25b}</UniqueIdentifier>
+      <UniqueIdentifier>{01a5dc5f-d795-40c6-864e-808dc3590189}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket">
-      <UniqueIdentifier>{532fb66b-6e8b-4ffd-8538-64955c333e91}</UniqueIdentifier>
+      <UniqueIdentifier>{6bc36fff-8351-4c61-84bc-d18e43dffd09}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{fa8a9da8-13d5-44bb-a5e1-9790f5de43f4}</UniqueIdentifier>
+      <UniqueIdentifier>{8e35d0fd-b0b9-4807-8a2e-9cf0da1e7df6}</UniqueIdentifier>
     </Filter>
     <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{59d15f40-dbbe-4094-b17b-5cb82666cc9e}</UniqueIdentifier>
+      <UniqueIdentifier>{c534f113-5e60-4cbc-bda8-9403113b1a69}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>