diff --git a/app/Setup_Wix/Product.wxs b/app/Setup_Wix/Product.wxs
new file mode 100644
index 0000000..5d580e6
--- /dev/null
+++ b/app/Setup_Wix/Product.wxs
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+  <Product Id="*" Name="ZSG Import Service" Language="1031" Codepage="1252" Version="$(var.ProductVersion)" Manufacturer="Digital Data" UpgradeCode="{3AF6A644-CBC5-4671-83C9-F9DFA58376EC}">
+    <Package
+      Id="*"
+      Keywords="Installer"
+      Description="[ProductName] Installer"
+      Comments="Copyright 2016 [Manufacturer]"
+      Manufacturer="[Manufacturer]"
+      InstallerVersion="100"
+      Languages="1031"
+      Compressed="yes"
+      SummaryCodepage="1252"
+      InstallScope="perMachine"
+    />
+
+    <Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
+    <Property Id='DiskPrompt' Value="Record Organizer Install" />
+
+    <MajorUpgrade
+      AllowDowngrades="no"
+      AllowSameVersionUpgrades="no"
+      DowngradeErrorMessage="Eine neuere Version von [ProductName] ist bereits installiert. Das Setup wird beendet."
+    />
+
+    <Property Id="APPLICATIONFOLDER">
+      <RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKCU" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
+    </Property>
+
+    <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
+    <Upgrade Id="{3AF6A644-CBC5-4671-83C9-F9DFA58376EC}">
+      <UpgradeVersion
+        Minimum="1.0.0.0" Maximum="99.0.0.0"
+        Property="PREVIOUSVERSIONSINSTALLED"
+        IncludeMinimum="yes" IncludeMaximum="no" />
+    </Upgrade>
+
+    <!-- Legt das Icon fest -->
+    <Icon Id="AppIcon" SourceFile="ZSG_Import.exe" />
+    <!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
+    <Property Id="ARPPRODUCTICON" Value="AppIcon" />
+
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="MANUFACTURERDIR" Name="Digital Data">
+          <Directory Id="INSTALLDIR" Name="ZSG Import Service" />
+        </Directory>
+      </Directory>
+    </Directory>
+
+    <DirectoryRef Id="INSTALLDIR">
+      <Component Id="ZSG_IMPORT" Guid="{4225A29C-E2AE-4788-B61E-4BC0884B9FE7}">
+        <File Id="ZSG_Import.exe" Name="ZSG_Import.exe" KeyPath="yes" Checksum="yes"></File>
+        <File Id="ZSG_Import.exe.config" Name="ZSG_Import.exe.config" Checksum="yes"></File>
+        <File Id="Interop.WINDREAMLib.dll" Name="Interop.WINDREAMLib.dll" Checksum="yes"></File>
+
+        <ServiceInstall
+          Id="ServiceInstaller"
+          Type="ownProcess"
+          Name="[ProductName]"
+          DisplayName="[ProductName]"
+          Description="ZSG Import Service"
+          Start="auto"
+          ErrorControl="normal" />
+      </Component>
+
+      <Component Id="REGISTRY_KEYS" Guid="{E39F0958-94B8-40FE-A1A6-60F12700EAC2}">
+        <RegistryKey Root="HKLM" Key="Software">
+
+          <RegistryKey Key="[Manufacturer]">
+            <RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Id="REGKEYINSTALLDIR">
+              <RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" />
+            </RegistryKey>
+          </RegistryKey>
+
+        </RegistryKey>
+
+        <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
+      </Component>
+    </DirectoryRef>
+
+    <Feature Id="MainApplication" Title="Main Application" Level="1">
+      <ComponentRef Id="ZSG_IMPORT" />
+      <ComponentRef Id="REGISTRY_KEYS" />
+    </Feature>
+
+    <!-- Legt das Standard-Installationsverzeichnis fest-->
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+
+    <UI>
+      <UIRef Id="WixUI_InstallDir" />
+      <UIRef Id="WixUI_ErrorProgressText" />
+      <Publish Dialog="WelcomeDlg"
+            Control="Next"
+            Event="NewDialog"
+            Value="InstallDirDlg"
+            Order="2">1</Publish>
+      <Publish Dialog="InstallDirDlg"
+            Control="Back"
+            Event="NewDialog"
+            Value="WelcomeDlg"
+            Order="2">1</Publish>
+    </UI>
+  </Product>
+</Wix>
\ No newline at end of file
diff --git a/app/Setup_Wix/Setup_Wix.wixproj b/app/Setup_Wix/Setup_Wix.wixproj
new file mode 100644
index 0000000..2e4f873
--- /dev/null
+++ b/app/Setup_Wix/Setup_Wix.wixproj
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.9</ProductVersion>
+    <ProjectGuid>95a34482-fb70-41f7-bcff-402b0e537b6a</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>Setup_Wix</OutputName>
+    <OutputType>Package</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+    <LinkerAdditionalOptions>-b "$(SolutionDir)ZSG_Import\bin\$(Configuration)" -cultures:de-DE,en-GB,en-US</LinkerAdditionalOptions>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+  <Target Name="BeforeBuild">
+    <!-- Get the programs assembly version from the .exe file -->
+    <GetAssemblyIdentity AssemblyFiles="..\ZSG_Import\bin\$(Configuration)\ZSG_Import.exe">
+      <Output TaskParameter="Assemblies" ItemName="AsmInfo" />
+    </GetAssemblyIdentity>
+    <!-- Store the assembly version number in ProductVersion preprocessor variable -->
+    <CreateProperty Value="$(DefineConstants);ProductVersion=%(AsmInfo.Version)">
+      <Output TaskParameter="Value" PropertyName="DefineConstants" />
+    </CreateProperty>
+  </Target>
+  <Target Name="BeforeBuild">
+    <!-- Get the programs assembly version from the .exe file -->
+    <GetAssemblyIdentity AssemblyFiles="..\ZSG_Import\bin\$(Configuration)\ZSG_Import.exe">
+      <Output TaskParameter="Assemblies" ItemName="AsmInfo" />
+    </GetAssemblyIdentity>
+    <!-- Store the assembly version number in ProductVersion preprocessor variable -->
+    <CreateProperty Value="$(DefineConstants);ProductVersion=%(AsmInfo.Version)">
+      <Output TaskParameter="Value" PropertyName="DefineConstants" />
+    </CreateProperty>
+    <!-- Name the .msi file after the solution platform and assembly version e.g TestService-x86-1.4.0.0.msi -->
+    <CreateProperty Value="$(SolutionName)-$(Platform)-%(AsmInfo.Version)">
+      <Output TaskParameter="Value" PropertyName="TargetName" />
+    </CreateProperty>
+    <!-- Name the .wixpdb file after the solution platform and assembly version e.g TestService-x86-1.4.0.0.msi -->
+    <CreateProperty Value="$(TargetName)$(TargetPdbExt)">
+      <Output TaskParameter="Value" PropertyName="TargetPdbName" />
+    </CreateProperty>
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/app/ZSG_Import.sln b/app/ZSG_Import.sln
index 77e9bb8..2784e4d 100644
--- a/app/ZSG_Import.sln
+++ b/app/ZSG_Import.sln
@@ -5,16 +5,38 @@ VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ZSG_Import", "ZSG_Import\ZSG_Import.vbproj", "{4591D818-6F38-4FBB-918D-76259EBBD7C6}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup_Wix", "Setup_Wix\Setup_Wix.wixproj", "{95A34482-FB70-41F7-BCFF-402B0E537B6A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{4591D818-6F38-4FBB-918D-76259EBBD7C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4591D818-6F38-4FBB-918D-76259EBBD7C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4591D818-6F38-4FBB-918D-76259EBBD7C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4591D818-6F38-4FBB-918D-76259EBBD7C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4591D818-6F38-4FBB-918D-76259EBBD7C6}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4591D818-6F38-4FBB-918D-76259EBBD7C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4591D818-6F38-4FBB-918D-76259EBBD7C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4591D818-6F38-4FBB-918D-76259EBBD7C6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4591D818-6F38-4FBB-918D-76259EBBD7C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4591D818-6F38-4FBB-918D-76259EBBD7C6}.Release|x86.ActiveCfg = Release|Any CPU
+		{95A34482-FB70-41F7-BCFF-402B0E537B6A}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{95A34482-FB70-41F7-BCFF-402B0E537B6A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{95A34482-FB70-41F7-BCFF-402B0E537B6A}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{95A34482-FB70-41F7-BCFF-402B0E537B6A}.Debug|x86.ActiveCfg = Debug|x86
+		{95A34482-FB70-41F7-BCFF-402B0E537B6A}.Debug|x86.Build.0 = Debug|x86
+		{95A34482-FB70-41F7-BCFF-402B0E537B6A}.Release|Any CPU.ActiveCfg = Release|x86
+		{95A34482-FB70-41F7-BCFF-402B0E537B6A}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{95A34482-FB70-41F7-BCFF-402B0E537B6A}.Release|Mixed Platforms.Build.0 = Release|x86
+		{95A34482-FB70-41F7-BCFF-402B0E537B6A}.Release|x86.ActiveCfg = Release|x86
+		{95A34482-FB70-41F7-BCFF-402B0E537B6A}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE