diff --git a/lib/specflow/Antlr3.Runtime.dll b/lib/specflow/Antlr3.Runtime.dll
deleted file mode 100644
index e39f7cf5c..000000000
Binary files a/lib/specflow/Antlr3.Runtime.dll and /dev/null differ
diff --git a/lib/specflow/Gherkin.dll b/lib/specflow/Gherkin.dll
new file mode 100644
index 000000000..045322970
Binary files /dev/null and b/lib/specflow/Gherkin.dll differ
diff --git a/lib/specflow/TechTalk.SpecFlow.Generator.dll b/lib/specflow/TechTalk.SpecFlow.Generator.dll
index 3ec51f47d..2cbb4eafa 100644
Binary files a/lib/specflow/TechTalk.SpecFlow.Generator.dll and b/lib/specflow/TechTalk.SpecFlow.Generator.dll differ
diff --git a/lib/specflow/TechTalk.SpecFlow.Parser.dll b/lib/specflow/TechTalk.SpecFlow.Parser.dll
index 4209aa1e6..229d44ffb 100644
Binary files a/lib/specflow/TechTalk.SpecFlow.Parser.dll and b/lib/specflow/TechTalk.SpecFlow.Parser.dll differ
diff --git a/lib/specflow/TechTalk.SpecFlow.Reporting.dll b/lib/specflow/TechTalk.SpecFlow.Reporting.dll
index b4a03be53..8fa6dd25f 100644
Binary files a/lib/specflow/TechTalk.SpecFlow.Reporting.dll and b/lib/specflow/TechTalk.SpecFlow.Reporting.dll differ
diff --git a/lib/specflow/TechTalk.SpecFlow.Silverlight.dll b/lib/specflow/TechTalk.SpecFlow.Silverlight.dll
new file mode 100644
index 000000000..505175810
Binary files /dev/null and b/lib/specflow/TechTalk.SpecFlow.Silverlight.dll differ
diff --git a/lib/specflow/TechTalk.SpecFlow.Utils.dll b/lib/specflow/TechTalk.SpecFlow.Utils.dll
new file mode 100644
index 000000000..73e3c5538
Binary files /dev/null and b/lib/specflow/TechTalk.SpecFlow.Utils.dll differ
diff --git a/lib/specflow/TechTalk.SpecFlow.VsIntegration.dll b/lib/specflow/TechTalk.SpecFlow.VsIntegration.dll
deleted file mode 100644
index be795171c..000000000
Binary files a/lib/specflow/TechTalk.SpecFlow.VsIntegration.dll and /dev/null differ
diff --git a/lib/specflow/TechTalk.SpecFlow.dll b/lib/specflow/TechTalk.SpecFlow.dll
index 03edced22..848f9bee5 100644
Binary files a/lib/specflow/TechTalk.SpecFlow.dll and b/lib/specflow/TechTalk.SpecFlow.dll differ
diff --git a/lib/specflow/TechTalk.SpecFlow.targets b/lib/specflow/TechTalk.SpecFlow.targets
index 5efdafcbb..249d8df99 100644
--- a/lib/specflow/TechTalk.SpecFlow.targets
+++ b/lib/specflow/TechTalk.SpecFlow.targets
@@ -1,58 +1,58 @@
-
-
-
-
-
-
-
- false
-
-
-
- false
-
- false
- false
- false
-
-
-
- false
- true
-
-
-
-
- UpdateFeatureFilesInProject;
- $(BuildDependsOn)
-
-
- SwitchToForceGenerate;
- $(RebuildDependsOn)
-
-
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ false
+
+
+
+ false
+
+ false
+ false
+ false
+
+
+
+ false
+ true
+
+
+
+
+ UpdateFeatureFilesInProject;
+ $(BuildDependsOn)
+
+
+ SwitchToForceGenerate;
+ $(RebuildDependsOn)
+
+
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
diff --git a/lib/specflow/TechTalk.SpecFlow.tasks b/lib/specflow/TechTalk.SpecFlow.tasks
index 3391be4c8..c652e133d 100644
--- a/lib/specflow/TechTalk.SpecFlow.tasks
+++ b/lib/specflow/TechTalk.SpecFlow.tasks
@@ -1,17 +1,17 @@
-
-
-
- specflow.exe
-
-
-
-
- <__SpecFlowTasksFullPath>$(SpecFlowTasksPath)
-
- <__SpecFlowTasksFullPath Condition="Exists('$(MSBuildProjectDirectory)\$(SpecFlowTasksPath)')"
- >$(MSBuildProjectDirectory)\$(SpecFlowTasksPath)
-
-
-
-
-
+
+
+
+ specflow.exe
+
+
+
+
+ <__SpecFlowTasksFullPath>$(SpecFlowTasksPath)
+
+ <__SpecFlowTasksFullPath Condition="Exists('$(MSBuildProjectDirectory)\$(SpecFlowTasksPath)')"
+ >$(MSBuildProjectDirectory)\$(SpecFlowTasksPath)
+
+
+
+
+
diff --git a/lib/specflow/changelog.txt b/lib/specflow/changelog.txt
index fb6d64f47..2ab96f7bb 100644
--- a/lib/specflow/changelog.txt
+++ b/lib/specflow/changelog.txt
@@ -1,50 +1,175 @@
-
-1.2.0 - 2009/11/25
-
-New features:
-+ Generate #line pragmas to the output file (Issue 26)
-+ Allow transformation of feature files from command-line and MsBuild (Issue 3)
-+ Merge all command-line tool (generation, reports) to a single executable: specflow.exe
-+ Support for Dutch and Swedish language
-+ Support enumerations in step binding arguments (Issue 28)
-
-Fixed issues:
-+ MsTest does not refresh tests automatically (Issue 25)
-+ Fixes in report localization
-+ Non-string parameters for bindings are not converted using the feature language (Issue 26)
-
-1.1.0 - 2009/11/11
-
-New features:
-+ Support for MsTest (Issue 4)
-+ Finalize configuration (Issue 13)
-+ Support German, French and Hungarian languages (Issue 5)
-+ Add strong-name for specflow assemblies (Issue 2)
-+ Allow scenario events to be instance methods (Issue 20)
-+ More descriptive name for the scenario outline example tests than XYZ_Variant1 (Issue 18)
-+ NUnit SpecFlow test execution report (Issue 23)
-+ Step definition usage report (Issue 24)
-
-Fixed issues:
-+ Runtime: Remove direct dependency on nunit.framework.dll from the runtime (Issue 12)
-+ Runtime: Binding methods with more than 4 parameters cannot be used (Issue 21)
-+ Generator: Special language characters (e.g. accented letters) are removed when generating test method names (Issue 22)
-
-1.0.2 - 2009/10/20
-
-New features:
-+ Runtime: allow non-static bindings
-+ Runtime: support multiple step attributes on a single binding method
-
-Fixed issues:
-+ VS: Error message is displayed when you add a SpecFlow project item to your project.
-+ Parser: mixed order of Given/When/Then is not supported
-+ Runtime: the original phrasing of the keywords (Given/And/But) is not preserved
-+ Generator: the generated test class has a "Fixture" suffix
-+ Parser: specifying any "given" should be optional
-
-
-1.0.1 - 2009/10/13
-
-Initial publish on http://www.specflow.org
-
+1.4.0 - 2010/10/07
+
+Breaking changes:
++ The generator has been improved to provide source code language. Because of this, SpecFlow test generated
+ with this version will be incompatible with older runtimes.
+
+New features:
++ Scoped Step Definitions: you can scope step definitions (bindings) to tags, features and scenarios. Scope filter
+ can be applied to a class or a method with the [StepScope] attribute.
+ See examples in Tests/FeatureTests/ScopedSteps/ScopedSteps.feature and Tests/FeatureTests/ScopedSteps/ScopedStepsBindings.cs
+ (Thanks to Jose Simas for the contribution.)
++ Adding binding-culture to App.config. If set, this culture is used during execution of steps.
++ VB-Step-Definition Skeleton Provider: For VB-projects, the suggested step skeletons are generated in VB.
++ Merging strongly typed context accessors from Darren Cauthon's SpecFlowAssist
++ Merging table/row extension methods from Darren Cauthon's SpecFlowAssist
+ Add a using statement for the namespace TechTalk.SpecFlow.Assist to use the extension methods.
+ See also Darren's youtube tutorial: http://bit.ly/aY4VOd
++ Diagnostic tracing: VS2010 integration can display trace messages to the Output window
+ if tracing is enabled. Tracing can be enabled by setting the environment variable SPECFLOW_TRACE
+ to either "all" or to the comma separated list of individual SpecFlow traing categories (currently
+ only the category "EditorParser" is supported).
+
+Fixed issues:
++ Better error reporting for wrong Gherkin files (multiple errors displayed, detect duplicate scenario names)
++ Visual Studio 2010 editor slows down after editing a feature file for a longer time (Issue 9)
+
+1.3.5.2 - 2010/08/11
+
+Fixed issues:
++ Sorry, we're ironing out our deploy strategy with the new Mono/MonoDevelop integration. We didn't
+ change the version in the MonoDevelop Add-In XML file.
+
+1.3.5.1 - 2010/08/11
+
+New features:
++ Support for hosting add-in on http://addins.monodevelop.com
+
+1.3.5 - 2010/08/11
+
+New features:
++ Support for Mono (v2.6.7) & MonoDevelop (v2.4) by Dale Ragan
+
+Fixed issues:
++ Generating code randomly for the wrong testing engine
++ Test class generation problem for Russian feature files
++ Fix tag support for Silverlight
+
+1.3.4 - 2010/07/28
+
+Fixed issues:
++ Installation fails if Visual Studio 2010 is not installed
++ VS2010: Background section is not colored properly
+
+1.3.3 - 2010/07/19
+
+New features:
++ Support for MsTest report generation
+ usage: specflow mstestexecutionreport projectFile [/testResult:value] [/xsltFile:value] [/out:value]
+ projectFile Visual Studio Project File containing specs
+ [/testResult:value] Test Result file generated by MsTest. Defaults to TestResult.trx
+ [/out:value] Generated Output File. Defaults to TestResult.html
+ [/xsltFile:value] Xslt file to use, defaults to built-in stylesheet if not provided
++ Visual Studio 2010 editor support:
+ - syntax coloring with configurable colors ("Gherkin ...")
+ - outlining for scenarios
+ Uninstall the beta integration (TechTalk.SpecFlow.VsIntegration.GherkinFile.vsix) before installing
+ SpecFlow 1.3.3.
+
+Fixed issues:
++ MbUnit execution fails for pending steps (Assert method not found: Inconclusive)
+
+1.3.2 - 2010/06/29
+
+New features:
++ Support for MsTest for .NET 4.0 categories. Configure the test provider name to
+ "MsTest.2010" in order to use the [TestCategory] attribute.
++ Silverlight support (beta), see http://wiki.github.com/techtalk/SpecFlow/silverlight-support
+
+Fixed issues:
++ Report generation fails if no custom XSLT is provided
+
+
+1.3.1 - 2010/06/21
+
+New features:
++ Using standard Gherkin parser (http://github.com/aslakhellesoy/gherkin) v2.0.1
++ Custom XSLT can be specified for generating reports.
+ See examples in Tests/ReportingTests/CustomXsltTemplate.feature
++ The test error can be accessed through ScenarioContext.Current.TestError
+ (e.g. in an AfterScenario event).
++ [StepTransformation] attribute has been renamed to [StepArgumentTransformation]
+ because this name describe the intention better. Using the old attribute will
+ generate a warning.
++ Support for MbUnit
+
+Fixed issues:
++ NullReference exception when using BeforeTestRun event (Issue 41)
+
+1.3.0 - 2010/05/05
+
+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
++ Using steps in other assemblies. This enables writing steps in VB. (Issue 19)
+ See examples in Tests/FeatureTests/ExternalSteps
++ Steps can be invoked from other steps using step text. See examples in
+ Tests/FeatureTests/CallingStepsFromStepDefinitions
++ Custom step parameter converters can be defined as a binding.
+ See examples in Tests/FeatureTests/StepArgumentTransfomation
++ SpecFlow feature files can be added also to VB.NET projects
++ Support for xUnit
++ Single installer for Visual Studio 2008 and 2010 (Issue 6, 10, 11)
++ Place GeneratedCodeAttribute and 'Designer generated code' region on generated code to
+ avoid having this code parsed by code analysis. (Issue 33)
++ Configuration option to disable all output. (Issue 29)
+ Use the following config to disable output:
+
+
+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
+
+New features:
++ Generate #line pragmas to the output file (Issue 26)
++ Allow transformation of feature files from command-line and MsBuild (Issue 3)
++ Merge all command-line tool (generation, reports) to a single executable: specflow.exe
++ Support for Dutch and Swedish language
++ Support enumerations in step binding arguments (Issue 28)
+
+Fixed issues:
++ MsTest does not refresh tests automatically (Issue 25)
++ Fixes in report localization
++ Non-string parameters for bindings are not converted using the feature language (Issue 26)
+
+1.1.0 - 2009/11/11
+
+New features:
++ Support for MsTest (Issue 4)
++ Finalize configuration (Issue 13)
++ Support German, French and Hungarian languages (Issue 5)
++ Add strong-name for specflow assemblies (Issue 2)
++ Allow scenario events to be instance methods (Issue 20)
++ More descriptive name for the scenario outline example tests than XYZ_Variant1 (Issue 18)
++ NUnit SpecFlow test execution report (Issue 23)
++ Step definition usage report (Issue 24)
+
+Fixed issues:
++ Runtime: Remove direct dependency on nunit.framework.dll from the runtime (Issue 12)
++ Runtime: Binding methods with more than 4 parameters cannot be used (Issue 21)
++ Generator: Special language characters (e.g. accented letters) are removed when generating
+ test method names (Issue 22)
+
+1.0.2 - 2009/10/20
+
+New features:
++ Runtime: allow non-static bindings
++ Runtime: support multiple step attributes on a single binding method
+
+Fixed issues:
++ VS: Error message is displayed when you add a SpecFlow project item to your project.
++ Parser: mixed order of Given/When/Then is not supported
++ Runtime: the original phrasing of the keywords (Given/And/But) is not preserved
++ Generator: the generated test class has a "Fixture" suffix
++ Parser: specifying any "given" should be optional
+
+
+1.0.1 - 2009/10/13
+
+Initial publish on http://www.specflow.org
+
diff --git a/lib/specflow/specflow.exe b/lib/specflow/specflow.exe
index d3df6f7e9..c228011e5 100644
Binary files a/lib/specflow/specflow.exe and b/lib/specflow/specflow.exe differ