Index: src/DSoilModel.sln
===================================================================
diff -u -r296 -r1021
--- src/DSoilModel.sln	(.../DSoilModel.sln)	(revision 296)
+++ src/DSoilModel.sln	(.../DSoilModel.sln)	(revision 1021)
@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31112.23
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.DSoilModel.Data", "Deltares.DSoilModel.Data\Deltares.DSoilModel.Data.csproj", "{37BC4D84-386E-425C-967B-CCF83E48A5F3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.DSoilModel.Forms", "Deltares.DSoilModel.Forms\Deltares.DSoilModel.Forms.csproj", "{99BF886D-E4BD-4298-960D-25F31C324395}"
@@ -19,30 +21,38 @@
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
 		Release|x86 = Release|x86
+		Setup|x86 = Setup|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{37BC4D84-386E-425C-967B-CCF83E48A5F3}.Debug|x86.ActiveCfg = Debug|x86
 		{37BC4D84-386E-425C-967B-CCF83E48A5F3}.Debug|x86.Build.0 = Debug|x86
 		{37BC4D84-386E-425C-967B-CCF83E48A5F3}.Release|x86.ActiveCfg = Release|x86
 		{37BC4D84-386E-425C-967B-CCF83E48A5F3}.Release|x86.Build.0 = Release|x86
+		{37BC4D84-386E-425C-967B-CCF83E48A5F3}.Setup|x86.ActiveCfg = Release|x86
 		{99BF886D-E4BD-4298-960D-25F31C324395}.Debug|x86.ActiveCfg = Debug|x86
 		{99BF886D-E4BD-4298-960D-25F31C324395}.Debug|x86.Build.0 = Debug|x86
 		{99BF886D-E4BD-4298-960D-25F31C324395}.Release|x86.ActiveCfg = Release|x86
 		{99BF886D-E4BD-4298-960D-25F31C324395}.Release|x86.Build.0 = Release|x86
+		{99BF886D-E4BD-4298-960D-25F31C324395}.Setup|x86.ActiveCfg = Release|x86
 		{61D69903-F728-40DF-9B6B-19E45C0621D6}.Debug|x86.ActiveCfg = Debug|x86
 		{61D69903-F728-40DF-9B6B-19E45C0621D6}.Debug|x86.Build.0 = Debug|x86
 		{61D69903-F728-40DF-9B6B-19E45C0621D6}.Release|x86.ActiveCfg = Release|x86
 		{61D69903-F728-40DF-9B6B-19E45C0621D6}.Release|x86.Build.0 = Release|x86
+		{61D69903-F728-40DF-9B6B-19E45C0621D6}.Setup|x86.ActiveCfg = Release|x86
 		{E3E0CC29-5031-47E2-B230-C077B9BB5061}.Debug|x86.ActiveCfg = Debug|x86
 		{E3E0CC29-5031-47E2-B230-C077B9BB5061}.Release|x86.ActiveCfg = Release|x86
+		{E3E0CC29-5031-47E2-B230-C077B9BB5061}.Setup|x86.ActiveCfg = Release|x86
+		{E3E0CC29-5031-47E2-B230-C077B9BB5061}.Setup|x86.Build.0 = Release|x86
 		{7FA5B2F2-3FEE-4706-908C-68BA03FDF084}.Debug|x86.ActiveCfg = Debug|x86
 		{7FA5B2F2-3FEE-4706-908C-68BA03FDF084}.Debug|x86.Build.0 = Debug|x86
 		{7FA5B2F2-3FEE-4706-908C-68BA03FDF084}.Release|x86.ActiveCfg = Release|x86
 		{7FA5B2F2-3FEE-4706-908C-68BA03FDF084}.Release|x86.Build.0 = Release|x86
+		{7FA5B2F2-3FEE-4706-908C-68BA03FDF084}.Setup|x86.ActiveCfg = Release|x86
 		{280EF52F-2056-4430-9644-880094A62A4C}.Debug|x86.ActiveCfg = Debug|x86
 		{280EF52F-2056-4430-9644-880094A62A4C}.Debug|x86.Build.0 = Debug|x86
 		{280EF52F-2056-4430-9644-880094A62A4C}.Release|x86.ActiveCfg = Release|x86
 		{280EF52F-2056-4430-9644-880094A62A4C}.Release|x86.Build.0 = Release|x86
+		{280EF52F-2056-4430-9644-880094A62A4C}.Setup|x86.ActiveCfg = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -51,4 +61,7 @@
 		{7FA5B2F2-3FEE-4706-908C-68BA03FDF084} = {EEEE9444-BDDA-44ED-A139-4A7B6F93BBCA}
 		{280EF52F-2056-4430-9644-880094A62A4C} = {EEEE9444-BDDA-44ED-A139-4A7B6F93BBCA}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {794295F4-935A-4905-AD05-14ACAB126567}
+	EndGlobalSection
 EndGlobal
Index: src/Deltares.DSoilModel.Data/Deltares.DSoilModel.Data.csproj
===================================================================
diff -u -r825 -r1021
--- src/Deltares.DSoilModel.Data/Deltares.DSoilModel.Data.csproj	(.../Deltares.DSoilModel.Data.csproj)	(revision 825)
+++ src/Deltares.DSoilModel.Data/Deltares.DSoilModel.Data.csproj	(.../Deltares.DSoilModel.Data.csproj)	(revision 1021)
@@ -82,6 +82,17 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Setup|x86'">
+    <OutputPath>bin\x86\Setup\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Deltares.Geographic">
       <HintPath>..\..\lib\Deltares\DslFormsMap\Deltares.Geographic.dll</HintPath>
Index: src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj
===================================================================
diff -u -r1017 -r1021
--- src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj	(.../Deltares.DSoilModel.Forms.csproj)	(revision 1017)
+++ src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj	(.../Deltares.DSoilModel.Forms.csproj)	(revision 1021)
@@ -81,6 +81,17 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Setup|x86'">
+    <OutputPath>bin\x86\Setup\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Deltares.Geographic, Version=16.1.0.0, Culture=neutral, PublicKeyToken=d4f3dcd34f9b7bc2, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
Index: src/Deltares.DSoilModel.Setup/Deltares.DSoilModel.Setup.wixproj
===================================================================
diff -u -r541 -r1021
--- src/Deltares.DSoilModel.Setup/Deltares.DSoilModel.Setup.wixproj	(.../Deltares.DSoilModel.Setup.wixproj)	(revision 541)
+++ src/Deltares.DSoilModel.Setup/Deltares.DSoilModel.Setup.wixproj	(.../Deltares.DSoilModel.Setup.wixproj)	(revision 1021)
@@ -98,6 +98,20 @@
   <PropertyGroup>
     <PreBuildEvent>$(ProjectDir)..\..\utils\svn_insert_version.cmd $(ProjectDir) Variables.wxi.svn Variables.wxi</PreBuildEvent>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Setup|x86' ">
+    <DefineConstants>BinFolder=..\bin\release; TutorialsFolder=..\..\data\Tutorials; WtiSosFolder=..\..\data\WTISOS2017</DefineConstants>
+    <SuppressIces>ICE61</SuppressIces>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Setup|AnyCPU' ">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Setup|Any CPU' ">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
   <!--
 	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.
Index: src/Deltares.DSoilModel.Forms.Tests/Deltares.DSoilModel.Forms.Tests.csproj
===================================================================
diff -u -r778 -r1021
--- src/Deltares.DSoilModel.Forms.Tests/Deltares.DSoilModel.Forms.Tests.csproj	(.../Deltares.DSoilModel.Forms.Tests.csproj)	(revision 778)
+++ src/Deltares.DSoilModel.Forms.Tests/Deltares.DSoilModel.Forms.Tests.csproj	(.../Deltares.DSoilModel.Forms.Tests.csproj)	(revision 1021)
@@ -23,6 +23,12 @@
     <OutputPath>..\bin\Release\</OutputPath>
     <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Setup|x86'">
+    <OutputPath>bin\x86\Setup\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <LangVersion>7.3</LangVersion>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Deltares.Geographic, Version=16.1.0.0, Culture=neutral, PublicKeyToken=d4f3dcd34f9b7bc2, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
Index: src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj
===================================================================
diff -u -r825 -r1021
--- src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj	(.../Deltares.DSoilModel.Data.Tests.csproj)	(revision 825)
+++ src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj	(.../Deltares.DSoilModel.Data.Tests.csproj)	(revision 1021)
@@ -23,6 +23,12 @@
     <OutputPath>..\bin\Release\</OutputPath>
     <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Setup|x86'">
+    <OutputPath>bin\x86\Setup\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <LangVersion>7.3</LangVersion>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Deltares.Geographic, Version=16.1.0.0, Culture=neutral, PublicKeyToken=d4f3dcd34f9b7bc2, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
Index: src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj
===================================================================
diff -u -r1017 -r1021
--- src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj	(.../Deltares.DSoilModel.Application.csproj)	(revision 1017)
+++ src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj	(.../Deltares.DSoilModel.Application.csproj)	(revision 1021)
@@ -41,6 +41,17 @@
   <PropertyGroup>
     <ApplicationIcon>D-SoilModel.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Setup|x86'">
+    <OutputPath>bin\x86\Setup\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Deltares.Geometry.Forms">
       <HintPath>..\..\lib\Deltares\DslFormsGeo\Deltares.Geometry.Forms.dll</HintPath>