diff --git a/GazeWebSocketServer.sln b/GazeWebSocketServer.sln
index b754b70..c429ceb 100644
--- a/GazeWebSocketServer.sln
+++ b/GazeWebSocketServer.sln
@@ -7,20 +7,38 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GazeWebSocketServer", "Gaze
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrackerBridge", "TrackerBridge\TrackerBridge.csproj", "{64D52257-ECA7-4F4D-A901-B14D544A1D0A}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MsiSetup", "MsiSetup\MsiSetup.wixproj", "{5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Debug|x86.Build.0 = Debug|Any CPU
 		{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Release|x86.ActiveCfg = Release|Any CPU
+		{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Release|x86.Build.0 = Release|Any CPU
 		{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Debug|x86.Build.0 = Debug|Any CPU
 		{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Release|x86.ActiveCfg = Release|Any CPU
+		{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Release|x86.Build.0 = Release|Any CPU
+		{5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Debug|x86.ActiveCfg = Debug|x86
+		{5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Debug|x86.Build.0 = Debug|x86
+		{5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Release|Any CPU.ActiveCfg = Release|x86
+		{5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Release|x86.ActiveCfg = Release|x86
+		{5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/MsiSetup/MsiSetup.wax b/MsiSetup/MsiSetup.wax
new file mode 100644
index 0000000..af5619b
Binary files /dev/null and b/MsiSetup/MsiSetup.wax differ
diff --git a/MsiSetup/MsiSetup.wixproj b/MsiSetup/MsiSetup.wixproj
new file mode 100644
index 0000000..a23fa4e
--- /dev/null
+++ b/MsiSetup/MsiSetup.wixproj
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>5a80ed30-7ca5-4a10-b2ab-7b3fe10ff56b</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>GazeWSS</OutputName>
+    <OutputType>Package</OutputType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="MsiSetup.wax" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\GazeWebSocketServer\GazeWebSocketServer.csproj">
+      <Name>GazeWebSocketServer</Name>
+      <Project>{f8f11e64-7946-4054-8c27-f0fcaf967f1a}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\TrackerBridge\TrackerBridge.csproj">
+      <Name>TrackerBridge</Name>
+      <Project>{64d52257-eca7-4f4d-a901-b14d544a1d0a}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>
\ No newline at end of file
diff --git a/MsiSetup/Product.wxs b/MsiSetup/Product.wxs
new file mode 100644
index 0000000..ddf1980
--- /dev/null
+++ b/MsiSetup/Product.wxs
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"><?define GazeWebSocketServer_TargetDir=$(var.GazeWebSocketServer.TargetDir)?><?define TrackerBridge_TargetDir=$(var.TrackerBridge.TargetDir)?>
+	<Product Id="9D55009E-629C-45A1-ADDC-8B64503A1517" Name="Gaze Web Socket Server" Language="1033" Version="1.0.0.0" Manufacturer="OTH Regensburg" UpgradeCode="972c80d8-c2bf-44ac-ae8c-beb6724671e8">
+		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+
+		<MajorUpgrade DowngradeErrorMessage="A newer version of Gaze Web Socket Server is already installed." />
+		<MediaTemplate EmbedCab="yes"/>
+
+		<Feature Id="ProductFeature" Title="Gaze Web Socket Server" Level="1">
+			<ComponentGroupRef Id="ProductComponents" />
+        <ComponentRef Id="ApplicationShortcut"/>
+		</Feature>
+	</Product>
+
+	<Fragment>
+		<Directory Id="TARGETDIR" Name="SourceDir">
+			<Directory Id="ProgramFilesFolder">
+				<Directory Id="INSTALLFOLDER" Name="GazeWebSocketServer" />
+			</Directory>
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ApplicationProgramsFolder" Name="GazeWSS"/>
+      </Directory>
+		</Directory>
+	</Fragment>
+
+  <Fragment>
+    <DirectoryRef Id="ApplicationProgramsFolder">
+      <Component Id="ApplicationShortcut" Guid="F93EE9A7-6BA4-41A9-8BD3-06D3ECD7468C">
+        <Shortcut Id="ApplicationStartMenuShortcut" Name="GazeWSS" Description="GazeWSS" Target="[INSTALLFOLDER]GazeWebSocketServer.exe" WorkingDirectory="INSTALLFOLDER"/>
+        <RemoveFolder Id="RemoveApplicationProgramsFolder" Directory="ApplicationProgramsFolder" On="uninstall"/>
+        <RegistryValue Root="HKCU" Key="Software/GazeWSS" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+
+	<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> -->
+			<Component Id="GazeWebSocketServer.exe" Guid="4c9d7223-abbb-41c4-925b-42a5468f74b0">
+			  <File Id="GazeWebSocketServer.exe" Name="GazeWebSocketServer.exe" Source="$(var.GazeWebSocketServer_TargetDir)GazeWebSocketServer.exe" />
+			</Component>
+			<Component Id="GazeWebSocketServer.exe.config" Guid="fb5b121d-6d61-442a-889c-6449b3a529f5">
+			  <File Id="GazeWebSocketServer.exe.config" Name="GazeWebSocketServer.exe.config" Source="$(var.GazeWebSocketServer_TargetDir)GazeWebSocketServer.exe.config" />
+			</Component>
+			<Component Id="websocket_sharp.dll" Guid="3eb56476-b21f-4717-9c6f-d51de832afd2">
+			  <File Id="websocket_sharp.dll" Name="websocket-sharp.dll" Source="$(var.GazeWebSocketServer_TargetDir)websocket-sharp.dll" />
+			</Component>
+			<Component Id="TrackerBridge.dll" Guid="a54be885-fe5f-4fa2-a1bb-023c5cf0e050">
+			  <File Id="TrackerBridge.dll" Name="TrackerBridge.dll" Source="$(var.TrackerBridge_TargetDir)TrackerBridge.dll" />
+			</Component>
+			<Component Id="Tobii.Research.dll" Guid="7ec1f6b5-9503-4079-8a31-c3528ef9863a">
+			  <File Id="Tobii.Research.dll" Name="Tobii.Research.dll" Source="$(var.GazeWebSocketServer_TargetDir)Tobii.Research.dll" />
+			</Component>
+		</ComponentGroup>
+	</Fragment>
+</Wix>