diff --git a/Installer/SpecFlowInstaller/CoreFiles.wxs b/Installer/SpecFlowInstaller/CoreFiles.wxs
index 2a857d4de..f95238a72 100644
--- a/Installer/SpecFlowInstaller/CoreFiles.wxs
+++ b/Installer/SpecFlowInstaller/CoreFiles.wxs
@@ -12,9 +12,13 @@
       <Component Id="Comp_CoreFiles" Guid="7022E635-FB3E-412e-9DA0-DBB84C96505F">
         <File Name="LICENSE.txt" Source="$(var.SolutionDir)\LICENSE.txt" />
         <File Name="changelog.txt" Source="$(var.SolutionDir)\changelog.txt" />
-        <File Name="Antlr3.Runtime.dll" Source="$(var.SolutionDir)\lib\antlr\Antlr3.Runtime.dll" />
         <File Name="TechTalk.SpecFlow.targets" Source="$(var.TechTalk.SpecFlow.Tools.ProjectDir)\MsBuild\TechTalk.SpecFlow.targets" />
         <File Name="TechTalk.SpecFlow.tasks" Source="$(var.TechTalk.SpecFlow.Tools.ProjectDir)\MsBuild\TechTalk.SpecFlow.tasks" />
+        <!-- files for the gherkin parser -->
+        <File Name="Gherkin.dll" Source="$(var.SolutionDir)\lib\gherkin\Gherkin.dll" />
+        <File Name="IKVM.Runtime.dll" Source="$(var.SolutionDir)\lib\gherkin\IKVM.Runtime.dll" />
+        <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" />
       </Component>
     </DirectoryRef>
 	</Fragment>
diff --git a/changelog.txt b/changelog.txt
index d56cc3f9c..986714b8c 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,6 +1,7 @@
 
 next release
 New features:
++ Using standard Gherkin parser (http://github.com/aslakhellesoy/gherkin) v1.0.24
 + Context injection in step definitions. Step definitions can get a context injected with 
   constructor injection. (Issue 30)
   See examples in Tests/FeatureTests/ContextInjection
@@ -22,6 +23,7 @@ New features:
 Fixed issues:
 + SpecFlow Reporting doesn't work with Firefox (Issue 31)
 + Binding methods are executed using the culture of the feature file.
++ Several parsing issues are solved now (Issue 1, 8, 9, 37)
 
 1.2.0 - 2009/11/25
 
diff --git a/lib/antlr/Antlr3.Runtime.dll b/lib/antlr/Antlr3.Runtime.dll
deleted file mode 100644
index e39f7cf5c..000000000
Binary files a/lib/antlr/Antlr3.Runtime.dll and /dev/null differ
diff --git a/lib/antlr/antlr-3.1.2.jar b/lib/antlr/antlr-3.1.2.jar
deleted file mode 100644
index 3c7e51e06..000000000
Binary files a/lib/antlr/antlr-3.1.2.jar and /dev/null differ