diff --git a/res/install.bat b/bin/install.bat
similarity index 100%
rename from res/install.bat
rename to bin/install.bat
diff --git a/res/uninstall.bat b/bin/uninstall.bat
similarity index 100%
rename from res/uninstall.bat
rename to bin/uninstall.bat
diff --git a/bin/update.bat b/bin/update.bat
new file mode 100644
index 0000000..f3874aa
--- /dev/null
+++ b/bin/update.bat
@@ -0,0 +1,10 @@
+@echo off
+if not exist "%~dp0RDPWInst.exe" goto :error
+"%~dp0RDPWInst" -w
+echo.
+goto :anykey
+:error
+echo [-] Installer executable not found.
+echo Please extract all files from the downloaded package or check your anti-virus.
+:anykey
+pause
diff --git a/res/rdpclip-x64.exe b/res/rdpclip-x64.exe
deleted file mode 100644
index bc2fcd4..0000000
Binary files a/res/rdpclip-x64.exe and /dev/null differ
diff --git a/res/rdpclip-x86.exe b/res/rdpclip-x86.exe
deleted file mode 100644
index 4b9bb5b..0000000
Binary files a/res/rdpclip-x86.exe and /dev/null differ
diff --git a/res/rdpwrap.ini b/res/rdpwrap.ini
index 2144bf6..5c67d17 100644
--- a/res/rdpwrap.ini
+++ b/res/rdpwrap.ini
@@ -768,4 +768,3 @@ bInitialized.x64      =F3464
 bMultimonAllowed.x64  =F3468
 ulMaxDebugSessions.x64=F346C
 bRemoteConnAllowed.x64=F3470
-_
\ No newline at end of file
diff --git a/src-installer/RDPWInst.dpr b/src-installer/RDPWInst.dpr
index a5bee95..db0a3ba 100644
--- a/src-installer/RDPWInst.dpr
+++ b/src-installer/RDPWInst.dpr
@@ -606,6 +606,8 @@ begin
 end;
 
 procedure ExtractFiles;
+var
+  RDPClipRes: String;
 begin
   if not DirectoryExists(ExtractFilePath(ExpandPath(WrapPath))) then
     if ForceDirectories(ExtractFilePath(ExpandPath(WrapPath))) then
@@ -616,18 +618,26 @@ begin
       Halt(0);
     end;
   ExtractRes('config', ExtractFilePath(ExpandPath(WrapPath)) + 'rdpwrap.ini');
+  RDPClipRes := '';
   case Arch of
     32: begin
       ExtractRes('rdpw32', ExpandPath(WrapPath));
-      if not FileExists(ExpandPath('%SystemRoot%\System32\rdpclip.exe')) then
-        ExtractRes('rdpclip32', ExpandPath('%SystemRoot%\System32\rdpclip.exe'));
+      if (FV.Version.w.Major = 6) and (FV.Version.w.Minor = 0) then
+        RDPClipRes := 'rdpclip6032';
+      if (FV.Version.w.Major = 6) and (FV.Version.w.Minor = 1) then
+        RDPClipRes := 'rdpclip6132';
     end;
     64: begin
       ExtractRes('rdpw64', ExpandPath(WrapPath));
-      if not FileExists(ExpandPath('%SystemRoot%\System32\rdpclip.exe')) then
-        ExtractRes('rdpclip64', ExpandPath('%SystemRoot%\System32\rdpclip.exe'));
+      if (FV.Version.w.Major = 6) and (FV.Version.w.Minor = 0) then
+        RDPClipRes := 'rdpclip6064';
+      if (FV.Version.w.Major = 6) and (FV.Version.w.Minor = 1) then
+        RDPClipRes := 'rdpclip6164';
     end;
   end;
+  if RDPClipRes <> '' then
+    if not FileExists(ExpandPath('%SystemRoot%\System32\rdpclip.exe')) then
+      ExtractRes(RDPClipRes, ExpandPath('%SystemRoot%\System32\rdpclip.exe'));
 end;
 
 procedure DeleteFiles;
diff --git a/src-installer/resource.res b/src-installer/resource.res
index 402086a..4dd1297 100644
Binary files a/src-installer/resource.res and b/src-installer/resource.res differ
diff --git a/src-rdpcheck/MainUnit.pas b/src-rdpcheck/MainUnit.pas
index a92abce..3c4655f 100644
--- a/src-rdpcheck/MainUnit.pas
+++ b/src-rdpcheck/MainUnit.pas
@@ -44,7 +44,6 @@ implementation
 procedure TFrm.FormCreate(Sender: TObject);
 var
   Reg: TRegistry;
-  Port: Integer;
 begin
   RDP.DisconnectedText := 'Disconnected.';
   RDP.ConnectingText := 'Connecting...';
diff --git a/src-rdpcheck/RDPCheck.dproj b/src-rdpcheck/RDPCheck.dproj
index d88a8c6..c5027ce 100644
--- a/src-rdpcheck/RDPCheck.dproj
+++ b/src-rdpcheck/RDPCheck.dproj
@@ -20,8 +20,9 @@
 			<Base>true</Base>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base)'!=''">
+			<DCC_ExeOutput>..\bin\</DCC_ExeOutput>
 			<DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
-			<DCC_DependencyCheckOutputName>RDPCheck.exe</DCC_DependencyCheckOutputName>
+			<DCC_DependencyCheckOutputName>..\bin\RDPCheck.exe</DCC_DependencyCheckOutputName>
 			<DCC_ImageBase>00400000</DCC_ImageBase>
 			<DCC_Platform>x86</DCC_Platform>
 		</PropertyGroup>
@@ -44,14 +45,14 @@
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>
 			</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
-				<Key>Cfg_2</Key>
-				<CfgParent>Base</CfgParent>
-			</BuildConfiguration>
 			<BuildConfiguration Include="Release">
 				<Key>Cfg_1</Key>
 				<CfgParent>Base</CfgParent>
 			</BuildConfiguration>
+			<BuildConfiguration Include="Debug">
+				<Key>Cfg_2</Key>
+				<CfgParent>Base</CfgParent>
+			</BuildConfiguration>
 		</ItemGroup>
 		<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
 		<ProjectExtensions>
@@ -68,7 +69,7 @@
 						<VersionInfo Name="IncludeVerInfo">True</VersionInfo>
 						<VersionInfo Name="AutoIncBuild">False</VersionInfo>
 						<VersionInfo Name="MajorVer">2</VersionInfo>
-						<VersionInfo Name="MinorVer">1</VersionInfo>
+						<VersionInfo Name="MinorVer">2</VersionInfo>
 						<VersionInfo Name="Release">0</VersionInfo>
 						<VersionInfo Name="Build">0</VersionInfo>
 						<VersionInfo Name="Debug">False</VersionInfo>
@@ -82,13 +83,13 @@
 					<VersionInfoKeys>
 						<VersionInfoKeys Name="CompanyName">Stas&apos;M Corp.</VersionInfoKeys>
 						<VersionInfoKeys Name="FileDescription">Local RDP Checker</VersionInfoKeys>
-						<VersionInfoKeys Name="FileVersion">2.1.0.0</VersionInfoKeys>
+						<VersionInfoKeys Name="FileVersion">2.2.0.0</VersionInfoKeys>
 						<VersionInfoKeys Name="InternalName">RDPCheck</VersionInfoKeys>
-						<VersionInfoKeys Name="LegalCopyright">Copyright © Stas&apos;M Corp. 2014</VersionInfoKeys>
+						<VersionInfoKeys Name="LegalCopyright">Copyright © Stas&apos;M Corp. 2015</VersionInfoKeys>
 						<VersionInfoKeys Name="LegalTrademarks">Stas&apos;M Corp.</VersionInfoKeys>
 						<VersionInfoKeys Name="OriginalFilename">RDPCheck.exe</VersionInfoKeys>
 						<VersionInfoKeys Name="ProductName">RDP Host Support</VersionInfoKeys>
-						<VersionInfoKeys Name="ProductVersion">1.3.0.0</VersionInfoKeys>
+						<VersionInfoKeys Name="ProductVersion">1.6.0.0</VersionInfoKeys>
 						<VersionInfoKeys Name="Comments">http://stascorp.com</VersionInfoKeys>
 					</VersionInfoKeys>
 					<Excluded_Packages>
diff --git a/src-rdpcheck/RDPCheck.res b/src-rdpcheck/RDPCheck.res
index 9ff016e..724bf2e 100644
Binary files a/src-rdpcheck/RDPCheck.res and b/src-rdpcheck/RDPCheck.res differ
diff --git a/src-rdpconfig/RDPConf.dproj b/src-rdpconfig/RDPConf.dproj
index ffc33d8..aa9ab96 100644
--- a/src-rdpconfig/RDPConf.dproj
+++ b/src-rdpconfig/RDPConf.dproj
@@ -20,8 +20,9 @@
 			<Base>true</Base>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base)'!=''">
+			<DCC_ExeOutput>..\bin\</DCC_ExeOutput>
 			<DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
-			<DCC_DependencyCheckOutputName>RDPConf.exe</DCC_DependencyCheckOutputName>
+			<DCC_DependencyCheckOutputName>..\bin\RDPConf.exe</DCC_DependencyCheckOutputName>
 			<DCC_ImageBase>00400000</DCC_ImageBase>
 			<DCC_Platform>x86</DCC_Platform>
 		</PropertyGroup>
@@ -47,14 +48,14 @@
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>
 			</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
-				<Key>Cfg_2</Key>
-				<CfgParent>Base</CfgParent>
-			</BuildConfiguration>
 			<BuildConfiguration Include="Release">
 				<Key>Cfg_1</Key>
 				<CfgParent>Base</CfgParent>
 			</BuildConfiguration>
+			<BuildConfiguration Include="Debug">
+				<Key>Cfg_2</Key>
+				<CfgParent>Base</CfgParent>
+			</BuildConfiguration>
 		</ItemGroup>
 		<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
 		<ProjectExtensions>
diff --git a/src-rdpconfig/RDPConf.res b/src-rdpconfig/RDPConf.res
index db065ef..f987dd9 100644
Binary files a/src-rdpconfig/RDPConf.res and b/src-rdpconfig/RDPConf.res differ
diff --git a/src-rdpconfig/resource.res b/src-rdpconfig/resource.res
index f750511..5a18ec8 100644
Binary files a/src-rdpconfig/resource.res and b/src-rdpconfig/resource.res differ