diff --git a/MT5Connector/MT5Connector.vcxproj b/MT5Connector/MT5Connector.vcxproj
index f877e50e..13c3ed5c 100755
--- a/MT5Connector/MT5Connector.vcxproj
+++ b/MT5Connector/MT5Connector.vcxproj
@@ -71,11 +71,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)\build\products\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)build\products\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)\build\products\$(Configuration)\$(Platform)\</OutDir>
+    <OutDir>$(SolutionDir)build\products\$(Configuration)\$(Platform)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
diff --git a/MetaTraderApi_2013.sln b/MetaTraderApi_2013.sln
index 7f2e8b40..ed2eeaa0 100755
--- a/MetaTraderApi_2013.sln
+++ b/MetaTraderApi_2013.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "TestServer\TestServer.csproj", "{220F01DF-8489-44F3-9C79-D5AFFCE94D6B}"
 EndProject
@@ -92,6 +92,7 @@ Global
 		{38B9C657-BC2F-44F0-8824-54B31F2A64F5}.Debug|x64.Build.0 = Debug|Any CPU
 		{38B9C657-BC2F-44F0-8824-54B31F2A64F5}.Release|Win32.ActiveCfg = Release|x86
 		{38B9C657-BC2F-44F0-8824-54B31F2A64F5}.Release|x64.ActiveCfg = Release|Any CPU
+		{38B9C657-BC2F-44F0-8824-54B31F2A64F5}.Release|x64.Build.0 = Release|Any CPU
 		{EB7C228D-9494-4985-845E-B8312450DF3D}.Debug|Win32.ActiveCfg = Debug|x86
 		{EB7C228D-9494-4985-845E-B8312450DF3D}.Debug|x64.ActiveCfg = Debug|x86
 		{EB7C228D-9494-4985-845E-B8312450DF3D}.Release|Win32.ActiveCfg = Release|x86
@@ -104,10 +105,12 @@ Global
 		{78B94552-DB17-40EC-B7C6-23D32DB85DC1}.Release|x64.ActiveCfg = Release|x86
 		{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Debug|Win32.ActiveCfg = Debug|x86
 		{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Debug|Win32.Build.0 = Debug|x86
-		{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Debug|x64.ActiveCfg = Debug|x86
+		{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Debug|x64.ActiveCfg = Debug|x64
+		{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Debug|x64.Build.0 = Debug|x64
 		{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Release|Win32.ActiveCfg = Release|x86
 		{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Release|Win32.Build.0 = Release|x86
-		{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Release|x64.ActiveCfg = Release|x86
+		{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Release|x64.ActiveCfg = Release|x64
+		{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/MtApi5Installer/MtApi5Installer.wixproj b/MtApi5Installer/MtApi5Installer.wixproj
index bb320e78..d974b19e 100755
--- a/MtApi5Installer/MtApi5Installer.wixproj
+++ b/MtApi5Installer/MtApi5Installer.wixproj
@@ -12,17 +12,32 @@
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <OutputPath>..\build\installers\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <OutputPath>..\build\installers\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DefineConstants>Debug</DefineConstants>
+    <OutputPath>..\build\installers\$(Configuration)\x64\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>..\build\installers\$(Configuration)\x64\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />
   </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/MtApi5Installer/Product.wxs b/MtApi5Installer/Product.wxs
index 307480c7..f412c8a5 100755
--- a/MtApi5Installer/Product.wxs
+++ b/MtApi5Installer/Product.wxs
@@ -1,30 +1,123 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="MtApi5Installer" Language="1033" Version="1.0.0.0" Manufacturer="" UpgradeCode="d72d346e-e6f7-4c23-85c6-1c42b3175599">
+    <?if $(var.Platform) = x64 ?>
+        <?define ProductName="MtApi5_x64" ?>
+        <?define ProductPathNative="..\build\products\$(var.Configuration)\"?>
+        <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+        <?define PlatformSystemFolder = "System64Folder" ?>    
+    <?else ?>
+        <?define ProductName="MtApi5" ?>
+        <?define ProductPathNative="..\build\products\$(var.Configuration)\x64\"?>
+        <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+        <?define PlatformSystemFolder = "SystemFolder" ?>
+    <?endif ?>
+
+    <?define ProductVersion="1.0.9" ?>
+    <?define Manufacturer="DW"?>
+    <?define ProductPath="..\build\products\$(var.Configuration)\"?>
+    
+	<Product Id="*" 
+            Name="$(var.ProductName) $(var.ProductVersion)" 
+            Language="1033" 
+            Version="$(var.ProductVersion)" 
+            Manufacturer="$(var.Manufacturer)" 
+            UpgradeCode="d72d346e-e6f7-4c23-85c6-1c42b3175599">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-		<MediaTemplate />
+        <MediaTemplate EmbedCab="yes" />
 
-		<Feature Id="ProductFeature" Title="MtApi5Installer" Level="1">
-			<ComponentGroupRef Id="ProductComponents" />
-		</Feature>
+        <Feature Id="MtApi5" Title="$(var.ProductName)" Level="1">
+            <ComponentGroupRef Id="MtApi5Components"/>
+        </Feature>
+
+        <Feature Id="MT5Connector" Title="MT5 Connector" Level="1">
+            <ComponentGroupRef Id="MT5ConnectorComponents"/>
+        </Feature>
+
+        <Property Id="WIXUI_INSTALLDIR">INSTALLFOLDER</Property>
+        <UIRef Id="WixUI_Mondo" />
 	</Product>
 
-	<Fragment>
-		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="ProgramFilesFolder">
-				<Directory Id="INSTALLFOLDER" Name="MtApi5Installer" />
-			</Directory>
-		</Directory>
-	</Fragment>
+    <Fragment>
+        <Directory Id="TARGETDIR" Name="SourceDir">
+            <Directory Id="$(var.PlatformProgramFilesFolder)">
+                <Directory Id="INSTALLFOLDER" Name="$(var.ProductName)">
 
-	<Fragment>
-		<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-			<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
-			<!-- <Component Id="ProductComponent"> -->
-				<!-- TODO: Insert files, registry keys, and other resources here. -->
-			<!-- </Component> -->
-		</ComponentGroup>
-	</Fragment>
+                    <Directory Id="ExpertFolder" Name="Experts">
+                    </Directory>
+
+                    <Directory Id="GAC" Name="GAC">
+                    </Directory>
+
+                </Directory>
+            </Directory>
+
+            <Directory Id="$(var.PlatformSystemFolder)">
+            </Directory>
+
+            <Directory Id="ProgramMenuFolder">
+                <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)">
+                </Directory>
+            </Directory>
+
+        </Directory>
+    </Fragment>
+
+    <Fragment>
+        <ComponentGroup Id="MtApi5Components">
+
+            <Component Id="MtApi5Dll" Directory="INSTALLFOLDER">
+                <File Id="MtApi5.dll" Name="MtApi5.dll" KeyPath="yes"
+                    Source="$(var.ProductPath)MtApi5.dll" />
+
+                <RegistryKey Root="HKLM"
+                    Key="Software\Microsoft\.NetFramework\v4.0.30319\AssemblyFoldersEx\$(var.ProductName)"
+                    Action="createAndRemoveOnUninstall">
+                    <RegistryValue Type="string" Value="[INSTALLFOLDER]"/>
+                </RegistryKey>
+
+            </Component>
+
+            <Component Id="MTApiServiceDll" Directory="INSTALLFOLDER">
+                <File Id="GAC_MTApiService.dll" Name="MTApiService.dll" KeyPath="yes"
+                    src="$(var.ProductPath)MTApiService.dll"/>
+            </Component>
+
+            <Component Id="MtApi5Expert" Directory="ExpertFolder">
+                <File Id="MtApi5.ex5" Name="MtApi5.ex5" KeyPath="yes"
+                      Source="..\mq5\MtApi5.ex5" />
+            </Component>
+
+            <Component Id="AppShortcutConnMgr" Guid="*" Directory="ApplicationProgramsFolder">
+                <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
+                <RegistryValue Root="HKCU" Key="Software\$(var.ProductName)" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+            </Component>
+
+        </ComponentGroup>
+
+        <ComponentGroup Id="MT5ConnectorComponents">
+
+            <Component Id="ConnectionProfileRegistryKey" Guid="*" Directory="INSTALLFOLDER">
+                <RegistryKey Root="HKCU"
+                             Key="Software\MtApi\ConnectionProfiles\Local"
+                      Action="createAndRemoveOnUninstall">
+                    <RegistryValue Type="string" Name="Host" Value=""/>
+                    <RegistryValue Type="integer" Name="Port" Value="8222" KeyPath="yes"/>
+                </RegistryKey>
+            </Component>
+
+            <Component Id="MTApiServiceDllGAC" Guid="6CD24D64-7DA1-4015-A5B3-B17C2488998C" Directory="GAC">
+                <File Id="MTApiService.dll" Name="MTApiService.dll" KeyPath="yes"
+                    src="$(var.ProductPath)MTApiService.dll" Checksum="yes"
+                    Assembly=".net" AssemblyManifest="MTApiService.dll" Vital="yes" />
+            </Component>
+
+            <Component Id="MT5ConnectorDll" Directory="$(var.PlatformSystemFolder)">
+                <File Id="MT5Connector5.dll" Name="MT5Connector.dll" KeyPath="yes"
+                      Source="$(var.ProductPathNative)MT5Connector.dll" />
+            </Component>
+
+        </ComponentGroup>
+    </Fragment>
 </Wix>
\ No newline at end of file