diff --git a/Installer/SpecFlowInstaller/CoreFiles.wxs b/Installer/SpecFlowInstaller/CoreFiles.wxs
index b7c564791..dedcadd8c 100644
--- a/Installer/SpecFlowInstaller/CoreFiles.wxs
+++ b/Installer/SpecFlowInstaller/CoreFiles.wxs
@@ -3,10 +3,9 @@
 <?include Common.wxi?>
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Fragment>
+  <Fragment>
     <ComponentGroup Id="CompGroup_CoreFiles">
       <ComponentRef Id="Comp_CoreFiles" />
-      <ComponentRef Id="Comp_AssociateGherkinFiles" />
     </ComponentGroup>
 
     <DirectoryRef Id="INSTALLLOCATION">
@@ -21,16 +20,13 @@
         <File Name="IKVM.OpenJDK.Core.dll" Source="$(var.SolutionDir)\lib\gherkin\IKVM.OpenJDK.Core.dll" />
         <File Name="IKVM.OpenJDK.Text.dll" Source="$(var.SolutionDir)\lib\gherkin\IKVM.OpenJDK.Text.dll" />
         <File Name="gherkin.ico" Source="$(var.SetupResourcesDir)\gherkin.ico" />
-      </Component>
-
-      <!-- Gherkin file associations -->
-      <Component Id="Comp_AssociateGherkinFiles" Guid="2AE052A2-F932-4282-BF38-021CC54FC441">
-        <ProgId Id="GherkinFile" Description="Gherkin Specification File" Icon="[INSTALLLOCATION]gherkin.ico">
+        <!-- Gherkin file associations -->
+        <ProgId Id="GherkinFile" Description="Gherkin Specification File" Icon="gherkin.ico">
           <Extension Id="feature" ContentType='application/text'>
             <!--<Verb Id="open" TargetProperty="VS90DEVENV" Command="Open" Argument='/edit "%1"' />-->
           </Extension>
         </ProgId>
       </Component>
     </DirectoryRef>
-	</Fragment>
+  </Fragment>
 </Wix>
\ No newline at end of file
diff --git a/Installer/SpecFlowInstaller/Product.wxs b/Installer/SpecFlowInstaller/Product.wxs
index d08cdd297..d112e3878 100644
--- a/Installer/SpecFlowInstaller/Product.wxs
+++ b/Installer/SpecFlowInstaller/Product.wxs
@@ -38,7 +38,7 @@
 
     <!-- Launch conditions -->
     <Condition Message="An administrator must approve or install [ProductName]."> Privileged </Condition>
-    <Condition Message="A later version of [ProductName] is already installed."> NOT NEWERVERSIONDETECTED </Condition>
+    <Condition Message="The same or a later version of [ProductName] is already installed."> NOT NEWERVERSIONDETECTED </Condition>
 
     <!-- Root directories -->
 		<Directory Id="TARGETDIR" Name="SourceDir">