diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58412dee9..8dde8e23f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,17 @@ Features in Experimental are subject to change and removal without being conside
 
 This document is formatted according to the principles of [Keep A CHANGELOG](http://keepachangelog.com).
 
+## [2.15.0] - 2017-03-09
+
+## Added
+
+- Continue loading feature files after parsing errors ([445](https://github.com/picklesdoc/pickles/pull/445)) (by [@dirkrombauts](https://github.com/dirkrombauts), based on an idea by [@pleveill](https://github.com/pleveill))
+
+### Fixed
+
+- Fix localisation of "Examples" in Scenario Outlines ([440](https://github.com/picklesdoc/pickles/pull/440)) (by [@dirkrombauts](https://github.com/dirkrombauts))
+- Make ExcludeTags available to MSBuild ([444](https://github.com/picklesdoc/pickles/pull/444)) (by [@dirkrombauts](https://github.com/dirkrombauts), based on an idea by [@pleveill](https://github.com/pleveill))
+
 ## [2.14.0] - 2017-02-24
 
 ### Added
diff --git a/build.bat b/build.bat
index 3db14c6bd..905f46acc 100644
--- a/build.bat
+++ b/build.bat
@@ -1,5 +1,5 @@
 @echo off
-set "picklesVersion=2.14.0"
+set "picklesVersion=2.15.0"
 
 cls
 
diff --git a/docs/Output/Dhtml/Index.html b/docs/Output/Dhtml/Index.html
index 7656126c1..be4fc7695 100644
--- a/docs/Output/Dhtml/Index.html
+++ b/docs/Output/Dhtml/Index.html
@@ -202,7 +202,7 @@ <h4 data-bind="text: Name, click: $root.toggleDetail" class="canHighlight, click
                                           </span>
                                           </div>
                                           <div>
-                                              <strong>Examples:</strong> <span data-bind="text: Name"></span>
+                                              <strong><span data-bind="text: $data.NativeKeyword"></span>:</strong> <span data-bind="text: Name"></span>
                                           </div>
                                           <div class="description" data-bind="html: renderMarkdownBlock(Description)"></div>
                                           <div data-bind="template: { name: 'table-template', data: $data.TableArgument }"></div>
diff --git a/docs/Output/Dhtml/js/featuresModel.js b/docs/Output/Dhtml/js/featuresModel.js
index d80bf4800..f76ded584 100644
--- a/docs/Output/Dhtml/js/featuresModel.js
+++ b/docs/Output/Dhtml/js/featuresModel.js
@@ -48,6 +48,7 @@ function Examples(data) {
     this.Description = data.Description || '';
     this.TableArgument = data.TableArgument == null ? null : new TableArgument(data.TableArgument.HeaderRow, data.TableArgument.DataRows);
     this.Tags = data.Tags || null;
+    this.NativeKeyword = data.NativeKeyword || "Examples";
   }
 
 function Background(data) {
diff --git a/docs/Output/Dhtml/pickledFeatures.js b/docs/Output/Dhtml/pickledFeatures.js
index d2dc22c60..6053dffc2 100644
--- a/docs/Output/Dhtml/pickledFeatures.js
+++ b/docs/Output/Dhtml/pickledFeatures.js
@@ -545,7 +545,8 @@ jsonPWrapper ({
                 "Tags": [
                   "@small",
                   "@short_test"
-                ]
+                ],
+                "NativeKeyword": "Examples"
               },
               {
                 "Name": "more than 100",
@@ -570,7 +571,8 @@ jsonPWrapper ({
                 },
                 "Tags": [
                   "@big"
-                ]
+                ],
+                "NativeKeyword": "Examples"
               }
             ],
             "Name": "Add two positive numbers with many examples",
@@ -644,7 +646,8 @@ jsonPWrapper ({
                     ]
                   ]
                 },
-                "Tags": []
+                "Tags": [],
+                "NativeKeyword": "Examples"
               },
               {
                 "Name": "more than 100",
@@ -667,7 +670,8 @@ jsonPWrapper ({
                     ]
                   ]
                 },
-                "Tags": []
+                "Tags": [],
+                "NativeKeyword": "Examples"
               }
             ],
             "Name": "Add two negative numbers with many examples",
@@ -2333,7 +2337,8 @@ jsonPWrapper ({
                     ]
                   ]
                 },
-                "Tags": []
+                "Tags": [],
+                "NativeKeyword": "Examples"
               }
             ],
             "Name": "Sample Markdown Scenario Outline Example",
@@ -3084,7 +3089,7 @@ jsonPWrapper ({
   },
   "Configuration": {
     "SutName": "Pickles",
-    "SutVersion": "2.14.0",
-    "GeneratedOn": "24 Februar 2017 18:09:34"
+    "SutVersion": "2.15.0",
+    "GeneratedOn": "9 März 2017 16:27:59"
   }
 });
\ No newline at end of file
diff --git a/docs/Output/Excel/features.xlsx b/docs/Output/Excel/features.xlsx
index 4c2bee85e..5ef1e3ccf 100644
Binary files a/docs/Output/Excel/features.xlsx and b/docs/Output/Excel/features.xlsx differ
diff --git a/docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html b/docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html
index 8a7c0974d..4a4c7ce59 100644
--- a/docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html
+++ b/docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html
@@ -305,9 +305,9 @@ <h2>Using And and But</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/00BasicGherkin/index.html b/docs/Output/Html/Features/00BasicGherkin/index.html
index 5d742fdb7..717c67ea9 100644
--- a/docs/Output/Html/Features/00BasicGherkin/index.html
+++ b/docs/Output/Html/Features/00BasicGherkin/index.html
@@ -268,9 +268,9 @@ <h1>00 Basic Gherkin</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/01TestRunner/TestRunnerIsNotImportant.html b/docs/Output/Html/Features/01TestRunner/TestRunnerIsNotImportant.html
index 0e0336a99..781bd3a66 100644
--- a/docs/Output/Html/Features/01TestRunner/TestRunnerIsNotImportant.html
+++ b/docs/Output/Html/Features/01TestRunner/TestRunnerIsNotImportant.html
@@ -278,9 +278,9 @@ <h2>A couple of simple steps</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/01TestRunner/index.html b/docs/Output/Html/Features/01TestRunner/index.html
index ef937b13d..bf998ceb6 100644
--- a/docs/Output/Html/Features/01TestRunner/index.html
+++ b/docs/Output/Html/Features/01TestRunner/index.html
@@ -266,9 +266,9 @@ <h1>01 Test Runner</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/02TagsAndHooks/Hooks.html b/docs/Output/Html/Features/02TagsAndHooks/Hooks.html
index 6e982ff7d..3848b4081 100644
--- a/docs/Output/Html/Features/02TagsAndHooks/Hooks.html
+++ b/docs/Output/Html/Features/02TagsAndHooks/Hooks.html
@@ -340,9 +340,9 @@ <h2>Hooking into pre conditions for Steps in SpecFlow</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/02TagsAndHooks/TagDemo.html b/docs/Output/Html/Features/02TagsAndHooks/TagDemo.html
index ad3dbce04..ee8b78c3f 100644
--- a/docs/Output/Html/Features/02TagsAndHooks/TagDemo.html
+++ b/docs/Output/Html/Features/02TagsAndHooks/TagDemo.html
@@ -358,9 +358,9 @@ <h2>A scenario with 2 tags</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/02TagsAndHooks/index.html b/docs/Output/Html/Features/02TagsAndHooks/index.html
index 3c3a8c921..56864b278 100644
--- a/docs/Output/Html/Features/02TagsAndHooks/index.html
+++ b/docs/Output/Html/Features/02TagsAndHooks/index.html
@@ -275,9 +275,9 @@ <h1>02 Tags And Hooks</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/031ScenarioContext/ScenarioContext.html b/docs/Output/Html/Features/031ScenarioContext/ScenarioContext.html
index dc226398a..641127c3c 100644
--- a/docs/Output/Html/Features/031ScenarioContext/ScenarioContext.html
+++ b/docs/Output/Html/Features/031ScenarioContext/ScenarioContext.html
@@ -344,9 +344,9 @@ <h2>Pending step</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/031ScenarioContext/index.html b/docs/Output/Html/Features/031ScenarioContext/index.html
index 63c8366f8..8a5c574b7 100644
--- a/docs/Output/Html/Features/031ScenarioContext/index.html
+++ b/docs/Output/Html/Features/031ScenarioContext/index.html
@@ -266,9 +266,9 @@ <h1>031 Scenario Context</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/032FeatureContext/FeatureContextFeatures.html b/docs/Output/Html/Features/032FeatureContext/FeatureContextFeatures.html
index 7e37922f9..eb04389bf 100644
--- a/docs/Output/Html/Features/032FeatureContext/FeatureContextFeatures.html
+++ b/docs/Output/Html/Features/032FeatureContext/FeatureContextFeatures.html
@@ -295,9 +295,9 @@ <h2>Showing information of the feature</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/032FeatureContext/index.html b/docs/Output/Html/Features/032FeatureContext/index.html
index 113029b12..9c9d15652 100644
--- a/docs/Output/Html/Features/032FeatureContext/index.html
+++ b/docs/Output/Html/Features/032FeatureContext/index.html
@@ -266,9 +266,9 @@ <h1>032 Feature Context</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/03ScenarioOutline/ScenarioOutline.html b/docs/Output/Html/Features/03ScenarioOutline/ScenarioOutline.html
index 9d10f2c89..057180274 100644
--- a/docs/Output/Html/Features/03ScenarioOutline/ScenarioOutline.html
+++ b/docs/Output/Html/Features/03ScenarioOutline/ScenarioOutline.html
@@ -434,9 +434,9 @@ <h3>Examples: more than 100</h3>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/03ScenarioOutline/index.html b/docs/Output/Html/Features/03ScenarioOutline/index.html
index c8bd9c1cf..460667876 100644
--- a/docs/Output/Html/Features/03ScenarioOutline/index.html
+++ b/docs/Output/Html/Features/03ScenarioOutline/index.html
@@ -266,9 +266,9 @@ <h1>03 Scenario Outline</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/04Background/BackgroundFeature.html b/docs/Output/Html/Features/04Background/BackgroundFeature.html
index dba46884b..81a56b867 100644
--- a/docs/Output/Html/Features/04Background/BackgroundFeature.html
+++ b/docs/Output/Html/Features/04Background/BackgroundFeature.html
@@ -305,9 +305,9 @@ <h2>Add 2 to the sum</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/04Background/index.html b/docs/Output/Html/Features/04Background/index.html
index 939b68cec..448c62759 100644
--- a/docs/Output/Html/Features/04Background/index.html
+++ b/docs/Output/Html/Features/04Background/index.html
@@ -266,9 +266,9 @@ <h1>04 Background</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/05TablesAndAssist/TableScenario.html b/docs/Output/Html/Features/05TablesAndAssist/TableScenario.html
index bf4b33af4..68e261b9c 100644
--- a/docs/Output/Html/Features/05TablesAndAssist/TableScenario.html
+++ b/docs/Output/Html/Features/05TablesAndAssist/TableScenario.html
@@ -326,9 +326,9 @@ <h2>Example of a wide table</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/05TablesAndAssist/index.html b/docs/Output/Html/Features/05TablesAndAssist/index.html
index c767a7deb..7d844ccb5 100644
--- a/docs/Output/Html/Features/05TablesAndAssist/index.html
+++ b/docs/Output/Html/Features/05TablesAndAssist/index.html
@@ -266,9 +266,9 @@ <h1>05 Tables And Assist</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/06CompareToAssist/CompareTo.html b/docs/Output/Html/Features/06CompareToAssist/CompareTo.html
index 594c704b1..954ff2cf8 100644
--- a/docs/Output/Html/Features/06CompareToAssist/CompareTo.html
+++ b/docs/Output/Html/Features/06CompareToAssist/CompareTo.html
@@ -298,9 +298,9 @@ <h2>CompareToSet</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/06CompareToAssist/index.html b/docs/Output/Html/Features/06CompareToAssist/index.html
index 38482a459..cae0ed902 100644
--- a/docs/Output/Html/Features/06CompareToAssist/index.html
+++ b/docs/Output/Html/Features/06CompareToAssist/index.html
@@ -266,9 +266,9 @@ <h1>06 Compare To Assist</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/07Localization/Svenska.html b/docs/Output/Html/Features/07Localization/Svenska.html
index 43ad3d501..af0957c63 100644
--- a/docs/Output/Html/Features/07Localization/Svenska.html
+++ b/docs/Output/Html/Features/07Localization/Svenska.html
@@ -280,9 +280,9 @@ <h2>Summera 5 och 7 ska vara 12</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/07Localization/Vlaams.html b/docs/Output/Html/Features/07Localization/Vlaams.html
index a654fe8ec..630147577 100644
--- a/docs/Output/Html/Features/07Localization/Vlaams.html
+++ b/docs/Output/Html/Features/07Localization/Vlaams.html
@@ -277,9 +277,9 @@ <h2>Het Scenario</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/07Localization/index.html b/docs/Output/Html/Features/07Localization/index.html
index d5a3b472a..c215934ab 100644
--- a/docs/Output/Html/Features/07Localization/index.html
+++ b/docs/Output/Html/Features/07Localization/index.html
@@ -273,9 +273,9 @@ <h1>07 Localization</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/08AttributeOverloading/AttributeOverloading.html b/docs/Output/Html/Features/08AttributeOverloading/AttributeOverloading.html
index 8a5a4236d..279de93af 100644
--- a/docs/Output/Html/Features/08AttributeOverloading/AttributeOverloading.html
+++ b/docs/Output/Html/Features/08AttributeOverloading/AttributeOverloading.html
@@ -286,9 +286,9 @@ <h2>Checking number for evenness</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/08AttributeOverloading/index.html b/docs/Output/Html/Features/08AttributeOverloading/index.html
index 380d2cfb2..0699eb304 100644
--- a/docs/Output/Html/Features/08AttributeOverloading/index.html
+++ b/docs/Output/Html/Features/08AttributeOverloading/index.html
@@ -266,9 +266,9 @@ <h1>08 Attribute Overloading</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/09CallingStepsFromSteps/CallingStepsFromSteps.html b/docs/Output/Html/Features/09CallingStepsFromSteps/CallingStepsFromSteps.html
index b325dd83f..509a0c2a3 100644
--- a/docs/Output/Html/Features/09CallingStepsFromSteps/CallingStepsFromSteps.html
+++ b/docs/Output/Html/Features/09CallingStepsFromSteps/CallingStepsFromSteps.html
@@ -298,9 +298,9 @@ <h2>Do something meaningful</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/09CallingStepsFromSteps/index.html b/docs/Output/Html/Features/09CallingStepsFromSteps/index.html
index 6d6d7e449..6725858af 100644
--- a/docs/Output/Html/Features/09CallingStepsFromSteps/index.html
+++ b/docs/Output/Html/Features/09CallingStepsFromSteps/index.html
@@ -266,9 +266,9 @@ <h1>09 Calling Steps From Steps</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/10StepTransformation/StepTransformation.html b/docs/Output/Html/Features/10StepTransformation/StepTransformation.html
index 155b01338..5927c5668 100644
--- a/docs/Output/Html/Features/10StepTransformation/StepTransformation.html
+++ b/docs/Output/Html/Features/10StepTransformation/StepTransformation.html
@@ -278,9 +278,9 @@ <h2>Steps with non-string arguments</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/10StepTransformation/index.html b/docs/Output/Html/Features/10StepTransformation/index.html
index ada765c02..dd79fb9fe 100644
--- a/docs/Output/Html/Features/10StepTransformation/index.html
+++ b/docs/Output/Html/Features/10StepTransformation/index.html
@@ -266,9 +266,9 @@ <h1>10 Step Transformation</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/11ContextInjection/ContextInjection.html b/docs/Output/Html/Features/11ContextInjection/ContextInjection.html
index 72ce6e150..4e0192b0b 100644
--- a/docs/Output/Html/Features/11ContextInjection/ContextInjection.html
+++ b/docs/Output/Html/Features/11ContextInjection/ContextInjection.html
@@ -346,9 +346,9 @@ <h2>Feature with a dependent context</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/11ContextInjection/index.html b/docs/Output/Html/Features/11ContextInjection/index.html
index 16bc9ca7d..6546d9ef5 100644
--- a/docs/Output/Html/Features/11ContextInjection/index.html
+++ b/docs/Output/Html/Features/11ContextInjection/index.html
@@ -268,9 +268,9 @@ <h1>11 Context Injection</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/12NestedFolders/ChildFolder/ChildChildFolder/NestedFolderExample.html b/docs/Output/Html/Features/12NestedFolders/ChildFolder/ChildChildFolder/NestedFolderExample.html
index d3813cd72..37e0ee99a 100644
--- a/docs/Output/Html/Features/12NestedFolders/ChildFolder/ChildChildFolder/NestedFolderExample.html
+++ b/docs/Output/Html/Features/12NestedFolders/ChildFolder/ChildChildFolder/NestedFolderExample.html
@@ -281,9 +281,9 @@ <h2>Nested - Add two numbers</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/12NestedFolders/ChildFolder/ChildChildFolder/index.html b/docs/Output/Html/Features/12NestedFolders/ChildFolder/ChildChildFolder/index.html
index 8b0c5d9e3..7a358c636 100644
--- a/docs/Output/Html/Features/12NestedFolders/ChildFolder/ChildChildFolder/index.html
+++ b/docs/Output/Html/Features/12NestedFolders/ChildFolder/ChildChildFolder/index.html
@@ -266,9 +266,9 @@ <h1>Child Child Folder</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/12NestedFolders/ChildFolder/index.html b/docs/Output/Html/Features/12NestedFolders/ChildFolder/index.html
index 75480ad34..5cd38481a 100644
--- a/docs/Output/Html/Features/12NestedFolders/ChildFolder/index.html
+++ b/docs/Output/Html/Features/12NestedFolders/ChildFolder/index.html
@@ -256,9 +256,9 @@ <h1>Child Folder</h1>
         <ul class="list" />
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/12NestedFolders/index.html b/docs/Output/Html/Features/12NestedFolders/index.html
index b186a1f6d..a51e74b2b 100644
--- a/docs/Output/Html/Features/12NestedFolders/index.html
+++ b/docs/Output/Html/Features/12NestedFolders/index.html
@@ -256,9 +256,9 @@ <h1>12 Nested Folders</h1>
         <ul class="list" />
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/13MultilineText/MultilineFeatureExample.html b/docs/Output/Html/Features/13MultilineText/MultilineFeatureExample.html
index 30c0b525e..768ac350f 100644
--- a/docs/Output/Html/Features/13MultilineText/MultilineFeatureExample.html
+++ b/docs/Output/Html/Features/13MultilineText/MultilineFeatureExample.html
@@ -281,9 +281,9 @@ <h2>Mutliline Output</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/13MultilineText/index.html b/docs/Output/Html/Features/13MultilineText/index.html
index 1f5af4678..a69d2a4b8 100644
--- a/docs/Output/Html/Features/13MultilineText/index.html
+++ b/docs/Output/Html/Features/13MultilineText/index.html
@@ -266,9 +266,9 @@ <h1>13 Multiline Text</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/14MarkdownExample/MarkdownExamples.html b/docs/Output/Html/Features/14MarkdownExample/MarkdownExamples.html
index 64b354ac3..1e20981eb 100644
--- a/docs/Output/Html/Features/14MarkdownExample/MarkdownExamples.html
+++ b/docs/Output/Html/Features/14MarkdownExample/MarkdownExamples.html
@@ -396,9 +396,9 @@ <h3>Examples: </h3>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/14MarkdownExample/index.html b/docs/Output/Html/Features/14MarkdownExample/index.html
index 957d2dca9..0a7ccd4fb 100644
--- a/docs/Output/Html/Features/14MarkdownExample/index.html
+++ b/docs/Output/Html/Features/14MarkdownExample/index.html
@@ -298,9 +298,9 @@ <h1>14 Markdown Example</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/15Pickles/InteractiveDHTMLView.html b/docs/Output/Html/Features/15Pickles/InteractiveDHTMLView.html
index f517addc1..6f425dac2 100644
--- a/docs/Output/Html/Features/15Pickles/InteractiveDHTMLView.html
+++ b/docs/Output/Html/Features/15Pickles/InteractiveDHTMLView.html
@@ -278,9 +278,9 @@ <h2>Scenario with large data table</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/15Pickles/index.html b/docs/Output/Html/Features/15Pickles/index.html
index 5eeee21bf..002e048fc 100644
--- a/docs/Output/Html/Features/15Pickles/index.html
+++ b/docs/Output/Html/Features/15Pickles/index.html
@@ -267,9 +267,9 @@ <h1>15 Pickles</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/Arithmetic.html b/docs/Output/Html/Features/Arithmetic.html
index 1044055da..21aacbc00 100644
--- a/docs/Output/Html/Features/Arithmetic.html
+++ b/docs/Output/Html/Features/Arithmetic.html
@@ -350,9 +350,9 @@ <h2>Divide two numbers</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/Trigonometry.html b/docs/Output/Html/Features/Trigonometry.html
index eaaf16ea6..9988f5238 100644
--- a/docs/Output/Html/Features/Trigonometry.html
+++ b/docs/Output/Html/Features/Trigonometry.html
@@ -317,9 +317,9 @@ <h2>Tangent</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/Workflow/ClearingScreen.html b/docs/Output/Html/Features/Workflow/ClearingScreen.html
index db2842e53..fb4dd9671 100644
--- a/docs/Output/Html/Features/Workflow/ClearingScreen.html
+++ b/docs/Output/Html/Features/Workflow/ClearingScreen.html
@@ -281,9 +281,9 @@ <h2>Clear the screen</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/Workflow/index.html b/docs/Output/Html/Features/Workflow/index.html
index 1ae37a2fb..8b408b74c 100644
--- a/docs/Output/Html/Features/Workflow/index.html
+++ b/docs/Output/Html/Features/Workflow/index.html
@@ -266,9 +266,9 @@ <h1>Workflow</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/index.html b/docs/Output/Html/Features/index.html
index 2a3e4734a..557a51dca 100644
--- a/docs/Output/Html/Features/index.html
+++ b/docs/Output/Html/Features/index.html
@@ -278,9 +278,9 @@ <h1>Features</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/index.html b/docs/Output/Html/index.html
index 3431f31dd..9b133a115 100644
--- a/docs/Output/Html/index.html
+++ b/docs/Output/Html/index.html
@@ -256,9 +256,9 @@ <h1>Examples</h1>
         <ul class="list" />
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/readme.html b/docs/Output/Html/readme.html
index c90d56d7f..c98a548bb 100644
--- a/docs/Output/Html/readme.html
+++ b/docs/Output/Html/readme.html
@@ -255,9 +255,9 @@
         <p>In the Features-folders you'll find quite a large population of .feature files that you can use to test out pickles on. </p>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/JSON/pickledFeatures.json b/docs/Output/JSON/pickledFeatures.json
index 9a81f4d73..670a4e6f2 100644
--- a/docs/Output/JSON/pickledFeatures.json
+++ b/docs/Output/JSON/pickledFeatures.json
@@ -545,7 +545,8 @@
                 "Tags": [
                   "@small",
                   "@short_test"
-                ]
+                ],
+                "NativeKeyword": "Examples"
               },
               {
                 "Name": "more than 100",
@@ -570,7 +571,8 @@
                 },
                 "Tags": [
                   "@big"
-                ]
+                ],
+                "NativeKeyword": "Examples"
               }
             ],
             "Name": "Add two positive numbers with many examples",
@@ -644,7 +646,8 @@
                     ]
                   ]
                 },
-                "Tags": []
+                "Tags": [],
+                "NativeKeyword": "Examples"
               },
               {
                 "Name": "more than 100",
@@ -667,7 +670,8 @@
                     ]
                   ]
                 },
-                "Tags": []
+                "Tags": [],
+                "NativeKeyword": "Examples"
               }
             ],
             "Name": "Add two negative numbers with many examples",
@@ -2333,7 +2337,8 @@
                     ]
                   ]
                 },
-                "Tags": []
+                "Tags": [],
+                "NativeKeyword": "Examples"
               }
             ],
             "Name": "Sample Markdown Scenario Outline Example",
@@ -3084,7 +3089,7 @@
   },
   "Configuration": {
     "SutName": "Pickles",
-    "SutVersion": "2.14.0",
-    "GeneratedOn": "24 Februar 2017 18:09:35"
+    "SutVersion": "2.15.0",
+    "GeneratedOn": "9 März 2017 16:28:01"
   }
 }
\ No newline at end of file
diff --git a/docs/Output/Word/Pickles.docx b/docs/Output/Word/Pickles.docx
index 98891ce4a..824434662 100644
Binary files a/docs/Output/Word/Pickles.docx and b/docs/Output/Word/Pickles.docx differ
diff --git a/docs/Output/Word/features.docx b/docs/Output/Word/features.docx
index 7c3b2499b..81f32a20a 100644
Binary files a/docs/Output/Word/features.docx and b/docs/Output/Word/features.docx differ
diff --git a/docs/index.html b/docs/index.html
index dfb5401c4..78a3679f9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -159,7 +159,7 @@ <h2 id="download">Download</h2>
                 </ul>
 
                 <p>
-                    If you prefer to download the .zip files, you can so from the <a href="https://github.com/picklesdoc/pickles/releases/tag/v2.14.0">Github release page</a>.
+                    If you prefer to download the .zip files, you can so from the <a href="https://github.com/picklesdoc/pickles/releases/tag/v2.15.0">Github release page</a>.
                 </p>
 
                 <!-- <h2 id="we_need_your_help">We need your help!</h2>
diff --git a/src/Pickles/.vs/config/applicationhost.config b/src/Pickles/.vs/config/applicationhost.config
index 984e93ccf..3dcf64fbb 100644
--- a/src/Pickles/.vs/config/applicationhost.config
+++ b/src/Pickles/.vs/config/applicationhost.config
@@ -163,7 +163,7 @@
             </site>
             <site name="Pickles.BaseDhtmlFiles" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\wps\kpi\pickles_plv\src\Pickles\Pickles.BaseDhtmlFiles" />                </application>
+                    <virtualDirectory path="/" physicalPath="C:\Dev\Code\GitHub\DirkRombauts\pickles\src\Pickles\Pickles.BaseDhtmlFiles" />                </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:52000:localhost" />
                 </bindings>
diff --git a/src/Pickles/Pickles.BaseDhtmlFiles/Index.html b/src/Pickles/Pickles.BaseDhtmlFiles/Index.html
index a5051a721..64256972e 100644
--- a/src/Pickles/Pickles.BaseDhtmlFiles/Index.html
+++ b/src/Pickles/Pickles.BaseDhtmlFiles/Index.html
@@ -196,7 +196,7 @@ <h4 data-bind="text: Name, click: $root.toggleDetail" class="canHighlight, click
                                           </span>
                                           </div>
                                           <div>
-                                              <strong>Examples:</strong> <span data-bind="text: Name"></span>
+                                              <strong><span data-bind="text: $data.NativeKeyword"></span>:</strong> <span data-bind="text: Name"></span>
                                           </div>
                                           <div class="description" data-bind="html: renderMarkdownBlock(Description)"></div>
                                           <div data-bind="template: { name: 'table-template', data: $data.TableArgument }"></div>
diff --git a/src/Pickles/Pickles.BaseDhtmlFiles/js/featuresModel.js b/src/Pickles/Pickles.BaseDhtmlFiles/js/featuresModel.js
index d80bf4800..f76ded584 100644
--- a/src/Pickles/Pickles.BaseDhtmlFiles/js/featuresModel.js
+++ b/src/Pickles/Pickles.BaseDhtmlFiles/js/featuresModel.js
@@ -48,6 +48,7 @@ function Examples(data) {
     this.Description = data.Description || '';
     this.TableArgument = data.TableArgument == null ? null : new TableArgument(data.TableArgument.HeaderRow, data.TableArgument.DataRows);
     this.Tags = data.Tags || null;
+    this.NativeKeyword = data.NativeKeyword || "Examples";
   }
 
 function Background(data) {
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Cucumber.UnitTests/AutomationLayer/StepDefinitions.cs b/src/Pickles/Pickles.DocumentationBuilders.Cucumber.UnitTests/AutomationLayer/StepDefinitions.cs
index f9058704c..2a1bca1a2 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Cucumber.UnitTests/AutomationLayer/StepDefinitions.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Cucumber.UnitTests/AutomationLayer/StepDefinitions.cs
@@ -45,7 +45,7 @@ public sealed class StepDefinitions : BaseFixture /* God object antipattern */
         public void IHaveThisFeatureDescription(string featureDescription)
         {
             var configuration = this.Configuration;
-            FeatureParser parser = new FeatureParser(this.FileSystem, configuration);
+            FeatureParser parser = new FeatureParser(configuration);
 
             var feature = parser.Parse(new StringReader(featureDescription));
 
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Dhtml/DhtmlDocumentationBuilder.cs b/src/Pickles/Pickles.DocumentationBuilders.Dhtml/DhtmlDocumentationBuilder.cs
index c0a91206b..2cd6de338 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Dhtml/DhtmlDocumentationBuilder.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Dhtml/DhtmlDocumentationBuilder.cs
@@ -41,12 +41,14 @@ public class DhtmlDocumentationBuilder : IDocumentationBuilder
         private readonly ITestResults testResults;
 
         private readonly IFileSystem fileSystem;
+        private readonly ILanguageServicesRegistry languageServicesRegistry;
 
-        public DhtmlDocumentationBuilder(IConfiguration configuration, ITestResults testResults, IFileSystem fileSystem)
+        public DhtmlDocumentationBuilder(IConfiguration configuration, ITestResults testResults, IFileSystem fileSystem, ILanguageServicesRegistry languageServicesRegistry)
         {
             this.configuration = configuration;
             this.testResults = testResults;
             this.fileSystem = fileSystem;
+            this.languageServicesRegistry = languageServicesRegistry;
         }
 
         public void Build(Tree features)
@@ -81,7 +83,7 @@ private void PullDownFeatureImages(IEnumerable<INode> features)
 
         private void UtilizeJsonBuilderToDumpJsonFeatureFileNextToDthmlResources(Tree features)
         {
-            var jsonBuilder = new JsonDocumentationBuilder(this.configuration, this.testResults, this.fileSystem);
+            var jsonBuilder = new JsonDocumentationBuilder(this.configuration, this.testResults, this.fileSystem, this.languageServicesRegistry);
             jsonBuilder.Build(features);
         }
 
@@ -93,7 +95,7 @@ private void WriteResources()
 
         private void TweakJsonFile()
         {
-            var jsonBuilder = new JsonDocumentationBuilder(this.configuration, this.testResults, this.fileSystem);
+            var jsonBuilder = new JsonDocumentationBuilder(this.configuration, this.testResults, this.fileSystem, this.languageServicesRegistry);
             var jsonFilePath = jsonBuilder.OutputFilePath;
 
             var tweaker = new JsonTweaker(this.fileSystem);
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Excel.UnitTests/WhenAddingAScenarioOutlineToAWorksheet.cs b/src/Pickles/Pickles.DocumentationBuilders.Excel.UnitTests/WhenAddingAScenarioOutlineToAWorksheet.cs
index 8bfa60599..189ac4483 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Excel.UnitTests/WhenAddingAScenarioOutlineToAWorksheet.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Excel.UnitTests/WhenAddingAScenarioOutlineToAWorksheet.cs
@@ -130,5 +130,47 @@ public void ThenSingleScenarioOutlineWithStepsAddedSuccessfully()
                 Check.That(row).IsEqualTo(13);
             }
         }
+
+        [Test]
+        public void ThenDutchScenarioWithScenarioOutlineContainsVoorbeelden()
+        {
+            var scenarioOutline = SetupScenarioOutline();
+
+            scenarioOutline.Feature = new Feature { Language = "nl" };
+
+            var excelScenarioFormatter = Container.Resolve<ExcelScenarioOutlineFormatter>();
+
+
+            using (var workbook = new XLWorkbook())
+            {
+                IXLWorksheet worksheet = workbook.AddWorksheet("SHEET1");
+                int row = 3;
+                excelScenarioFormatter.Format(worksheet, scenarioOutline, ref row);
+
+                Check.That(worksheet.Cell("B5").Value).IsEqualTo("Voorbeelden");
+            }
+        }
+
+        private static ScenarioOutline SetupScenarioOutline()
+        {
+            var scenarioOutline = new ScenarioOutline
+            {
+                Name = "Test Feature",
+                Examples = new List<Example>
+                {
+                    new Example
+                    {
+                        Name = "Examples",
+                        Description = string.Empty,
+                        TableArgument = new Table
+                        {
+                            HeaderRow = new TableRow(),
+                            DataRows = new List<TableRow>()
+                        }
+                    }
+                },
+            };
+            return scenarioOutline;
+        }
     }
 }
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Excel/ExcelScenarioOutlineFormatter.cs b/src/Pickles/Pickles.DocumentationBuilders.Excel/ExcelScenarioOutlineFormatter.cs
index a23e65cdc..62f9ab78d 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Excel/ExcelScenarioOutlineFormatter.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Excel/ExcelScenarioOutlineFormatter.cs
@@ -31,17 +31,20 @@ public class ExcelScenarioOutlineFormatter
         private readonly ExcelTableFormatter excelTableFormatter;
         private readonly IConfiguration configuration;
         private readonly ITestResults testResults;
+        private readonly ILanguageServicesRegistry languageServicesRegistry;
 
         public ExcelScenarioOutlineFormatter(
             ExcelStepFormatter excelStepFormatter,
             ExcelTableFormatter excelTableFormatter,
             IConfiguration configuration,
-            ITestResults testResults)
+            ITestResults testResults,
+            ILanguageServicesRegistry languageServicesRegistry)
         {
             this.excelStepFormatter = excelStepFormatter;
             this.excelTableFormatter = excelTableFormatter;
             this.configuration = configuration;
             this.testResults = testResults;
+            this.languageServicesRegistry = languageServicesRegistry;
         }
 
         public void Format(IXLWorksheet worksheet, ScenarioOutline scenarioOutline, ref int row)
@@ -79,9 +82,11 @@ public void Format(IXLWorksheet worksheet, ScenarioOutline scenarioOutline, ref
 
             row++;
 
+            var languageServices = this.languageServicesRegistry.GetLanguageServicesForLanguage(scenarioOutline.Feature?.Language);
+
             foreach (var example in scenarioOutline.Examples)
             {
-                worksheet.Cell(row++, "B").Value = "Examples";
+                worksheet.Cell(row++, "B").Value = languageServices.ExamplesKeywords[0];
 
                 if (example.Tags != null && example.Tags.Count != 0)
                 {
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Html.UnitTests/Pickles.DocumentationBuilders.Html.UnitTests.csproj b/src/Pickles/Pickles.DocumentationBuilders.Html.UnitTests/Pickles.DocumentationBuilders.Html.UnitTests.csproj
index c001dbe8b..4b24df14e 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Html.UnitTests/Pickles.DocumentationBuilders.Html.UnitTests.csproj
+++ b/src/Pickles/Pickles.DocumentationBuilders.Html.UnitTests/Pickles.DocumentationBuilders.Html.UnitTests.csproj
@@ -48,6 +48,10 @@
       <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.IO.Abstractions.TestingHelpers, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.TestingHelpers.2.0.0.140\lib\net40\System.IO.Abstractions.TestingHelpers.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -78,6 +82,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StrikeMarkdownProviderTests.cs" />
     <Compile Include="WhenFormattingFeatures.cs" />
+    <Compile Include="WhenFormattingLocalizedFeatures.cs" />
     <Compile Include="WhenFormattingMultilineStrings.cs" />
     <Compile Include="WhenFormattingScenario.cs" />
     <Compile Include="WhenFormattingScenarioOutlines.cs" />
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Html.UnitTests/WhenFormattingLocalizedFeatures.cs b/src/Pickles/Pickles.DocumentationBuilders.Html.UnitTests/WhenFormattingLocalizedFeatures.cs
new file mode 100644
index 000000000..4485fe34e
--- /dev/null
+++ b/src/Pickles/Pickles.DocumentationBuilders.Html.UnitTests/WhenFormattingLocalizedFeatures.cs
@@ -0,0 +1,63 @@
+//  --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="WhenFormattingLocalizedFeatures.cs" company="PicklesDoc">
+//  Copyright 2011 Jeffrey Cameron
+//  Copyright 2012-present PicklesDoc team and community contributors
+//
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+using System.IO;
+using Autofac;
+using NFluent;
+using NUnit.Framework;
+using PicklesDoc.Pickles.ObjectModel;
+using PicklesDoc.Pickles.Test;
+
+namespace PicklesDoc.Pickles.DocumentationBuilders.Html.UnitTests
+{
+    [TestFixture]
+    public class WhenFormattingLocalizedFeatures : BaseFixture
+    {
+        [Test]
+        public void ThenShouldLocalizeExamplesKeyword()
+        {
+            string featureText =
+@"# language: nl-NL
+Functionaliteit: Test het abstract scenario
+
+Abstract Scenario: Het Scenario
+    Stel dat ik 50 ingeef
+    En dat ik 70 ingeef
+    Als ik plus druk
+    Dan moet het resultaat 120 zijn
+
+Voorbeelden:
+    | a |
+    | 1 |
+    | 2 |
+";
+
+            var parser = new FeatureParser(this.Configuration);
+            Feature feature = parser.Parse(new StringReader(featureText));
+
+            var formatter = Container.Resolve<HtmlFeatureFormatter>();
+            var output = formatter.Format(feature);
+
+            var value = output.ToString();
+            Check.That(value).Contains("Voorbeelden");
+
+        }
+    }
+}
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Html.UnitTests/packages.config b/src/Pickles/Pickles.DocumentationBuilders.Html.UnitTests/packages.config
index 8bb88eb50..d6ce66364 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Html.UnitTests/packages.config
+++ b/src/Pickles/Pickles.DocumentationBuilders.Html.UnitTests/packages.config
@@ -4,4 +4,5 @@
   <package id="NFluent" version="1.3.1.0" targetFramework="net45" />
   <package id="NUnit" version="3.6.0" targetFramework="net45" />
   <package id="System.IO.Abstractions" version="2.0.0.140" targetFramework="net45" />
+  <package id="System.IO.Abstractions.TestingHelpers" version="2.0.0.140" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Html/HtmlScenarioOutlineFormatter.cs b/src/Pickles/Pickles.DocumentationBuilders.Html/HtmlScenarioOutlineFormatter.cs
index b23f4252f..068efd182 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Html/HtmlScenarioOutlineFormatter.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Html/HtmlScenarioOutlineFormatter.cs
@@ -35,19 +35,22 @@ public class HtmlScenarioOutlineFormatter
         private readonly HtmlTableFormatter htmlTableFormatter;
         private readonly XNamespace xmlns;
         private readonly ITestResults testResults;
+        private readonly ILanguageServicesRegistry languageServicesRegistry;
 
         public HtmlScenarioOutlineFormatter(
             HtmlStepFormatter htmlStepFormatter,
             HtmlDescriptionFormatter htmlDescriptionFormatter,
             HtmlTableFormatter htmlTableFormatter,
             HtmlImageResultFormatter htmlImageResultFormatter,
-            ITestResults testResults)
+            ITestResults testResults,
+            ILanguageServicesRegistry languageServicesRegistry)
         {
             this.htmlStepFormatter = htmlStepFormatter;
             this.htmlDescriptionFormatter = htmlDescriptionFormatter;
             this.htmlTableFormatter = htmlTableFormatter;
             this.htmlImageResultFormatter = htmlImageResultFormatter;
             this.testResults = testResults;
+            this.languageServicesRegistry = languageServicesRegistry;
             this.xmlns = HtmlNamespace.Xhtml;
         }
 
@@ -117,6 +120,8 @@ private XElement FormatExamples(ScenarioOutline scenarioOutline)
         {
             var exampleDiv = new XElement(this.xmlns + "div");
 
+            var languageServices = this.languageServicesRegistry.GetLanguageServicesForLanguage(scenarioOutline.Feature?.Language);
+
             foreach (var example in scenarioOutline.Examples)
             {
                 exampleDiv.Add(
@@ -124,7 +129,7 @@ private XElement FormatExamples(ScenarioOutline scenarioOutline)
                         this.xmlns + "div",
                         new XAttribute("class", "examples"),
                         (example.Tags == null || example.Tags.Count == 0) ? null : new XElement(this.xmlns + "p", new XAttribute("class", "tags"), HtmlScenarioFormatter.CreateTagElements(example.Tags.OrderBy(t => t).ToArray(), this.xmlns)),
-                        new XElement(this.xmlns + "h3", "Examples: " + example.Name),
+                        new XElement(this.xmlns + "h3", languageServices.ExamplesKeywords[0] + ": " + example.Name),
                         this.htmlDescriptionFormatter.Format(example.Description),
                         (example.TableArgument == null) ? null : this.htmlTableFormatter.Format(example.TableArgument, scenarioOutline)));
             }
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Json.UnitTests/AutomationLayer/StepDefinitions.cs b/src/Pickles/Pickles.DocumentationBuilders.Json.UnitTests/AutomationLayer/StepDefinitions.cs
index ce76c3bd8..ef18a003e 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Json.UnitTests/AutomationLayer/StepDefinitions.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Json.UnitTests/AutomationLayer/StepDefinitions.cs
@@ -43,7 +43,7 @@ public sealed class StepDefinitions : BaseFixture /* God object antipattern */
         public void IHaveThisFeatureDescription(string featureDescription)
         {
             var configuration = this.Configuration;
-            FeatureParser parser = new FeatureParser(this.FileSystem, configuration);
+            FeatureParser parser = new FeatureParser(configuration);
 
             var feature = parser.Parse(new StringReader(featureDescription));
 
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Json/JSONDocumentationBuilder.cs b/src/Pickles/Pickles.DocumentationBuilders.Json/JSONDocumentationBuilder.cs
index 5eb7f6bf1..6731b4fc9 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Json/JSONDocumentationBuilder.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Json/JSONDocumentationBuilder.cs
@@ -45,12 +45,14 @@ public class JsonDocumentationBuilder : IDocumentationBuilder
         private readonly ITestResults testResults;
 
         private readonly IFileSystem fileSystem;
+        private readonly ILanguageServicesRegistry languageServicesRegistry;
 
-        public JsonDocumentationBuilder(IConfiguration configuration, ITestResults testResults, IFileSystem fileSystem)
+        public JsonDocumentationBuilder(IConfiguration configuration, ITestResults testResults, IFileSystem fileSystem, ILanguageServicesRegistry languageServicesRegistry)
         {
             this.configuration = configuration;
             this.testResults = testResults;
             this.fileSystem = fileSystem;
+            this.languageServicesRegistry = languageServicesRegistry;
         }
 
         public string OutputFilePath
@@ -80,6 +82,7 @@ public void Build(Tree features)
                         featuresToFormat.Add(
                             new JsonFeatureWithMetaInfo(
                                 featureTreeNode,
+                                this.languageServicesRegistry,
                                 this.testResults.GetFeatureResult(
                                     featureTreeNode.Feature)));
                     }
@@ -87,7 +90,8 @@ public void Build(Tree features)
                     {
                         featuresToFormat.Add(
                             new JsonFeatureWithMetaInfo(
-                                featureTreeNode));
+                                featureTreeNode,
+                                this.languageServicesRegistry));
                     }
                 }
             }
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Json/JsonExample.cs b/src/Pickles/Pickles.DocumentationBuilders.Json/JsonExample.cs
index d5da793dc..3ea8c037e 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Json/JsonExample.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Json/JsonExample.cs
@@ -32,5 +32,7 @@ public class JsonExample
         public JsonTable TableArgument { get; set; }
 
         public List<string> Tags { get; set; }
+
+        public string NativeKeyword { get; set; }
     }
 }
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Json/JsonFeatureWithMetaInfo.cs b/src/Pickles/Pickles.DocumentationBuilders.Json/JsonFeatureWithMetaInfo.cs
index 7124b3a1a..7ce8faf94 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Json/JsonFeatureWithMetaInfo.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Json/JsonFeatureWithMetaInfo.cs
@@ -27,14 +27,14 @@ namespace PicklesDoc.Pickles.DocumentationBuilders.Json
 {
     public class JsonFeatureWithMetaInfo
     {
-        public JsonFeatureWithMetaInfo(FeatureNode featureNodeTreeNode)
-            : this(featureNodeTreeNode, default(TestResult))
+        public JsonFeatureWithMetaInfo(FeatureNode featureNodeTreeNode, ILanguageServicesRegistry languageServicesRegistry)
+            : this(featureNodeTreeNode, languageServicesRegistry, default(TestResult))
         {
         }
 
-        public JsonFeatureWithMetaInfo(FeatureNode featureNodeTreeNode, TestResult result)
+        public JsonFeatureWithMetaInfo(FeatureNode featureNodeTreeNode, ILanguageServicesRegistry languageServicesRegistry, TestResult result)
         {
-            var jsonMapper = new JsonMapper();
+            var jsonMapper = new JsonMapper(languageServicesRegistry);
             this.Feature = jsonMapper.Map(featureNodeTreeNode.Feature);
             this.RelativeFolder = featureNodeTreeNode.RelativePathFromRoot;
             this.Result = jsonMapper.Map(result);
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Json/JsonMapper.cs b/src/Pickles/Pickles.DocumentationBuilders.Json/JsonMapper.cs
index 2dfe714ce..5dba9d445 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Json/JsonMapper.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Json/JsonMapper.cs
@@ -26,6 +26,13 @@ namespace PicklesDoc.Pickles.DocumentationBuilders.Json
 {
     public class JsonMapper
     {
+        private readonly ILanguageServicesRegistry languageServicesRegistry;
+
+        public JsonMapper(ILanguageServicesRegistry languageServicesRegistry)
+        {
+            this.languageServicesRegistry = languageServicesRegistry;
+        }
+
         public JsonFeature Map(Feature feature)
         {
             return this.ToJsonFeature(feature);
@@ -43,7 +50,7 @@ private JsonTestResult ToJsonTestResult(TestResult testResult)
 
         private JsonFeature ToJsonFeature(Feature feature)
         {
-            return new Mapper.FeatureToJsonFeatureMapper().Map(feature);
+            return new Mapper.FeatureToJsonFeatureMapper(this.languageServicesRegistry).Map(feature);
         }
     }
 }
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Json/Mapper/ExampleToJsonExampleMapper.cs b/src/Pickles/Pickles.DocumentationBuilders.Json/Mapper/ExampleToJsonExampleMapper.cs
index 90f7adcd4..71ccfb0ed 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Json/Mapper/ExampleToJsonExampleMapper.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Json/Mapper/ExampleToJsonExampleMapper.cs
@@ -28,25 +28,32 @@ namespace PicklesDoc.Pickles.DocumentationBuilders.Json.Mapper
     public class ExampleToJsonExampleMapper
     {
         private readonly TableToJsonTableMapper tableMapper;
+        private readonly ILanguageServicesRegistry languageServicesRegistry;
 
-        public ExampleToJsonExampleMapper()
+        public ExampleToJsonExampleMapper(ILanguageServicesRegistry languageServicesRegistry)
         {
+            this.languageServicesRegistry = languageServicesRegistry;
             this.tableMapper = new TableToJsonTableMapper();
         }
 
-        public JsonExample Map(Example example)
+        public JsonExample Map(Example example, string language)
         {
             if (example == null)
             {
                 return null;
             }
 
+            var languageServices = this.languageServicesRegistry.GetLanguageServicesForLanguage(language);
+
+            var examplesKeyword = languageServices.ExamplesKeywords[0];
+
             return new JsonExample
             {
                 Name = example.Name,
                 Description = example.Description,
                 TableArgument = this.tableMapper.Map(example.TableArgument),
                 Tags = (example.Tags ?? new List<string>()).ToList(),
+                NativeKeyword = examplesKeyword
             };
         }
     }
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Json/Mapper/FeatureToJsonFeatureMapper.cs b/src/Pickles/Pickles.DocumentationBuilders.Json/Mapper/FeatureToJsonFeatureMapper.cs
index 9786f5632..e33fc5005 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Json/Mapper/FeatureToJsonFeatureMapper.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Json/Mapper/FeatureToJsonFeatureMapper.cs
@@ -31,10 +31,10 @@ public class FeatureToJsonFeatureMapper
         private readonly ScenarioOutlineToJsonScenarioOutlineMapper scenarioOutlineMapper;
         private readonly TestResultToJsonTestResultMapper resultMapper;
 
-        public FeatureToJsonFeatureMapper()
+        public FeatureToJsonFeatureMapper(ILanguageServicesRegistry languageServicesRegistry)
         {
             this.scenarioMapper = new ScenarioToJsonScenarioMapper();
-            this.scenarioOutlineMapper = new ScenarioOutlineToJsonScenarioOutlineMapper();
+            this.scenarioOutlineMapper = new ScenarioOutlineToJsonScenarioOutlineMapper(languageServicesRegistry);
             this.resultMapper = new TestResultToJsonTestResultMapper();
         }
 
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Json/Mapper/ScenarioOutlineToJsonScenarioOutlineMapper.cs b/src/Pickles/Pickles.DocumentationBuilders.Json/Mapper/ScenarioOutlineToJsonScenarioOutlineMapper.cs
index ccf39b35c..0e6783ae0 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Json/Mapper/ScenarioOutlineToJsonScenarioOutlineMapper.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Json/Mapper/ScenarioOutlineToJsonScenarioOutlineMapper.cs
@@ -32,11 +32,11 @@ public class ScenarioOutlineToJsonScenarioOutlineMapper
         private readonly StepToJsonStepMapper stepMapper;
         private readonly ExampleToJsonExampleMapper exampleMapper;
 
-        public ScenarioOutlineToJsonScenarioOutlineMapper()
+        public ScenarioOutlineToJsonScenarioOutlineMapper(ILanguageServicesRegistry languageServicesRegistry)
         {
             this.resultMapper = new TestResultToJsonTestResultMapper();
             this.stepMapper = new StepToJsonStepMapper();
-            this.exampleMapper = new ExampleToJsonExampleMapper();
+            this.exampleMapper = new ExampleToJsonExampleMapper(languageServicesRegistry);
         }
 
         public JsonScenarioOutline Map(ScenarioOutline scenarioOutline)
@@ -48,7 +48,7 @@ public JsonScenarioOutline Map(ScenarioOutline scenarioOutline)
 
             return new JsonScenarioOutline
             {
-                Examples = (scenarioOutline.Examples ?? new List<Example>()).Select(this.exampleMapper.Map).ToList(),
+                Examples = (scenarioOutline.Examples ?? new List<Example>()).Select(example => this.exampleMapper.Map(example, scenarioOutline.Feature?.Language)).ToList(),
                 Steps = (scenarioOutline.Steps ?? new List<Step>()).Select(this.stepMapper.Map).ToList(),
                 Tags = (scenarioOutline.Tags ?? new List<string>()).ToList(),
                 Name = scenarioOutline.Name,
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Json/Mapper/ScenarioToJsonScenarioMapper.cs b/src/Pickles/Pickles.DocumentationBuilders.Json/Mapper/ScenarioToJsonScenarioMapper.cs
index 76a6b7815..08b5e0736 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Json/Mapper/ScenarioToJsonScenarioMapper.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Json/Mapper/ScenarioToJsonScenarioMapper.cs
@@ -30,13 +30,11 @@ public class ScenarioToJsonScenarioMapper
     {
         private readonly TestResultToJsonTestResultMapper resultMapper;
         private readonly StepToJsonStepMapper stepMapper;
-        private readonly ExampleToJsonExampleMapper exampleMapper;
 
         public ScenarioToJsonScenarioMapper()
         {
             this.resultMapper = new TestResultToJsonTestResultMapper();
             this.stepMapper = new StepToJsonStepMapper();
-            this.exampleMapper = new ExampleToJsonExampleMapper();
         }
 
         public JsonScenario Map(Scenario scenario)
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Word.UnitTests/WhenBuildingWordDocuments.cs b/src/Pickles/Pickles.DocumentationBuilders.Word.UnitTests/WhenBuildingWordDocuments.cs
index 1c96dc39e..914553366 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Word.UnitTests/WhenBuildingWordDocuments.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Word.UnitTests/WhenBuildingWordDocuments.cs
@@ -46,10 +46,12 @@ public class WhenBuildingWordDocuments : BaseFixture
         [SetUp]
         public void Setup()
         {
+            var rootPath = FileSystem.DirectoryInfo.FromDirectoryName(RootPath);
+
             AddFakeFolderStructures();
 
             Configuration.OutputFolder = this.FileSystem.DirectoryInfo.FromDirectoryName(FileSystemPrefix);
-            this.features = Container.Resolve<DirectoryTreeCrawler>().Crawl(RootPath);
+            this.features = Container.Resolve<DirectoryTreeCrawler>().Crawl(rootPath, new ParsingReport());
             this.builder = Container.Resolve<WordDocumentationBuilder>();
         }
 
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Word/WordScenarioOutlineFormatter.cs b/src/Pickles/Pickles.DocumentationBuilders.Word/WordScenarioOutlineFormatter.cs
index 1d7a517bf..c7798a5ee 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Word/WordScenarioOutlineFormatter.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Word/WordScenarioOutlineFormatter.cs
@@ -34,13 +34,15 @@ public class WordScenarioOutlineFormatter
         private readonly ITestResults testResults;
         private readonly WordStepFormatter wordStepFormatter;
         private readonly WordTableFormatter wordTableFormatter;
+        private readonly ILanguageServicesRegistry languageServicesRegistry;
 
-        public WordScenarioOutlineFormatter(WordStepFormatter wordStepFormatter, WordTableFormatter wordTableFormatter, IConfiguration configuration, ITestResults testResults)
+        public WordScenarioOutlineFormatter(WordStepFormatter wordStepFormatter, WordTableFormatter wordTableFormatter, IConfiguration configuration, ITestResults testResults, ILanguageServicesRegistry languageServicesRegistry)
         {
             this.wordStepFormatter = wordStepFormatter;
             this.wordTableFormatter = wordTableFormatter;
             this.configuration = configuration;
             this.testResults = testResults;
+            this.languageServicesRegistry = languageServicesRegistry;
         }
 
         public void Format(Body body, ScenarioOutline scenarioOutline)
@@ -76,9 +78,12 @@ public void Format(Body body, ScenarioOutline scenarioOutline)
                 this.wordStepFormatter.Format(body, step);
             }
 
+            var languageServices = this.languageServicesRegistry.GetLanguageServicesForLanguage(scenarioOutline.Feature?.Language);
+            var examplesKeyword = languageServices.ExamplesKeywords[0];
+
             foreach (var example in scenarioOutline.Examples)
             {
-                body.Append(new Paragraph(new ParagraphProperties(new ParagraphStyleId { Val = "Heading3" }), new Run(new RunProperties(), new Text("Examples:"))));
+                body.Append(new Paragraph(new ParagraphProperties(new ParagraphStyleId { Val = "Heading3" }), new Run(new RunProperties(), new Text(examplesKeyword + ":"))));
 
                 if (example.Tags.Count != 0)
                 {
diff --git a/src/Pickles/Pickles.MSBuild/build/Pickles.MSBuild.targets b/src/Pickles/Pickles.MSBuild/build/Pickles.MSBuild.targets
index ad3079f1c..fb6b0158f 100644
--- a/src/Pickles/Pickles.MSBuild/build/Pickles.MSBuild.targets
+++ b/src/Pickles/Pickles.MSBuild/build/Pickles.MSBuild.targets
@@ -19,6 +19,7 @@
             DocumentationFormat="$(Pickles_DocumentationFormat)"
             Language="$(Pickles_Language)"
             IncludeExperimentalFeatures="$(Pickles_IncludeExperimentalFeatures)"
-            EnableComments="$(Pickles_EnableComments)" />
+            EnableComments="$(Pickles_EnableComments)"
+            ExcludeTags="$(Pickles_ExcludeTags" />
     </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.ObjectModel/ILanguageServices.cs b/src/Pickles/Pickles.ObjectModel/ILanguageServices.cs
index 88f525793..02738f774 100644
--- a/src/Pickles/Pickles.ObjectModel/ILanguageServices.cs
+++ b/src/Pickles/Pickles.ObjectModel/ILanguageServices.cs
@@ -32,5 +32,9 @@ public interface ILanguageServices
         string[] AndStepKeywords { get; }
 
         string[] ButStepKeywords { get; }
+
+        string[] ExamplesKeywords { get; }
+
+        string Language { get; }
     }
 }
\ No newline at end of file
diff --git a/src/Pickles/Pickles.ObjectModel/ILanguageServicesRegistry.cs b/src/Pickles/Pickles.ObjectModel/ILanguageServicesRegistry.cs
new file mode 100644
index 000000000..fad395b05
--- /dev/null
+++ b/src/Pickles/Pickles.ObjectModel/ILanguageServicesRegistry.cs
@@ -0,0 +1,28 @@
+//  --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="ILanguageServicesRegistry.cs" company="PicklesDoc">
+//  Copyright 2011 Jeffrey Cameron
+//  Copyright 2012-present PicklesDoc team and community contributors
+//
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+namespace PicklesDoc.Pickles
+{
+    public interface ILanguageServicesRegistry
+    {
+        ILanguageServices GetLanguageServicesForLanguage(string language);
+
+        string DefaultLanguage { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Pickles/Pickles.ObjectModel/ObjectModel/Feature.cs b/src/Pickles/Pickles.ObjectModel/ObjectModel/Feature.cs
index 1028133f7..0c4367e04 100644
--- a/src/Pickles/Pickles.ObjectModel/ObjectModel/Feature.cs
+++ b/src/Pickles/Pickles.ObjectModel/ObjectModel/Feature.cs
@@ -45,6 +45,8 @@ public Feature()
 
         public List<string> Tags { get; }
 
+        public string Language { get; set; }
+
         public void AddTag(string tag)
         {
             this.Tags.Add(tag);
diff --git a/src/Pickles/Pickles.ObjectModel/Pickles.ObjectModel.csproj b/src/Pickles/Pickles.ObjectModel/Pickles.ObjectModel.csproj
index dc315ae11..4318a59ab 100644
--- a/src/Pickles/Pickles.ObjectModel/Pickles.ObjectModel.csproj
+++ b/src/Pickles/Pickles.ObjectModel/Pickles.ObjectModel.csproj
@@ -57,6 +57,7 @@
     <Compile Include="IConfiguration.cs" />
     <Compile Include="DocumentationBuilders\IDocumentationBuilder.cs" />
     <Compile Include="ILanguageServices.cs" />
+    <Compile Include="ILanguageServicesRegistry.cs" />
     <Compile Include="IMarkdownProvider.cs" />
     <Compile Include="ObjectModel\Location.cs" />
     <Compile Include="ObjectModel\Example.cs" />
diff --git a/src/Pickles/Pickles.Test/ConfigurationTests.cs b/src/Pickles/Pickles.Test/ConfigurationTests.cs
new file mode 100644
index 000000000..84b0a3735
--- /dev/null
+++ b/src/Pickles/Pickles.Test/ConfigurationTests.cs
@@ -0,0 +1,55 @@
+//  --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="ConfigurationTests.cs" company="PicklesDoc">
+//  Copyright 2011 Jeffrey Cameron
+//  Copyright 2012-present PicklesDoc team and community contributors
+//
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+using NFluent;
+using NUnit.Framework;
+
+namespace PicklesDoc.Pickles.Test
+{
+    [TestFixture]
+    public class ConfigurationTests
+    {
+        [Test]
+        public void Constructor_Default_SetsLanguageToEnglish()
+        {
+            var configuration = new Configuration();
+
+            Check.That(configuration.Language).IsEqualTo("en");
+        }
+
+        [Test]
+        public void Constructor_WithLanguageServicesRegistryThatDefaultsToDutch_SetsLangugageToDutch()
+        {
+            var configuration = new Configuration(new DutchDefaultingLanguageServicesRegistry());
+
+            Check.That(configuration.Language).IsEqualTo("nl");
+        }
+
+        public class DutchDefaultingLanguageServicesRegistry : ILanguageServicesRegistry
+        {
+            public ILanguageServices GetLanguageServicesForLanguage(string language)
+            {
+                throw new System.NotImplementedException();
+            }
+
+            public string DefaultLanguage => "nl";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Pickles/Pickles.Test/FeatureNodeFactoryTests.cs b/src/Pickles/Pickles.Test/FeatureNodeFactoryTests.cs
new file mode 100644
index 000000000..57f55488f
--- /dev/null
+++ b/src/Pickles/Pickles.Test/FeatureNodeFactoryTests.cs
@@ -0,0 +1,119 @@
+//  --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="FeatureNodeFactoryTests.cs" company="PicklesDoc">
+//  Copyright 2011 Jeffrey Cameron
+//  Copyright 2012-present PicklesDoc team and community contributors
+//
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+using System;
+using System.IO;
+using System.IO.Abstractions.TestingHelpers;
+using System.Linq;
+using NFluent;
+using NUnit.Framework;
+using PicklesDoc.Pickles.DirectoryCrawler;
+using PicklesDoc.Pickles.DocumentationBuilders.Html;
+
+namespace PicklesDoc.Pickles.Test
+{
+    [TestFixture]
+    public class FeatureNodeFactoryTests : BaseFixture
+    {
+        [Test]
+        public void Create_InvalidFeatureFile_AddsEntryToReport()
+        {
+            FileSystem.AddFile(@"c:\test.feature", new MockFileData("Invalid feature file"));
+
+            var featureNodeFactory = this.CreateFeatureNodeFactory();
+
+            var report = new ParsingReport();
+
+            featureNodeFactory.Create(null, FileSystem.FileInfo.FromFileName(@"c:\test.feature"), report);
+
+            Check.That(report.First()).Contains(@"c:\test.feature");
+        }
+
+        private FeatureNodeFactory CreateFeatureNodeFactory()
+        {
+            return new FeatureNodeFactory(
+                new RelevantFileDetector(),
+                new FileSystemBasedFeatureParser(
+                    new FeatureParser(Configuration),
+                    FileSystem),
+                new HtmlMarkdownFormatter(
+                    new MarkdownProvider()),
+                FileSystem);
+        }
+
+        [Test]
+        public void Create_InvalidFileType_AddsEntryToReport()
+        {
+            FileSystem.AddFile(@"c:\test.dll", new MockFileData("Invalid feature file"));
+
+            var featureNodeFactory = this.CreateFeatureNodeFactory();
+
+            var report = new ParsingReport();
+
+            featureNodeFactory.Create(null, FileSystem.FileInfo.FromFileName(@"c:\test.dll"), report);
+
+            Check.That(report.First()).Contains(@"c:\test.dll");
+        }
+
+        [Test]
+        public void Create_BogusLocationType_AddsEntryToReport()
+        {
+            var featureNodeFactory = this.CreateFeatureNodeFactory();
+
+            var report = new ParsingReport();
+
+            featureNodeFactory.Create(null, new BogusFileSystemInfoBase { fullName = "Totally Bad Name"}, report);
+
+            Check.That(report.First()).Contains(@"Totally Bad Name");
+        }
+
+        private class BogusFileSystemInfoBase : System.IO.Abstractions.FileSystemInfoBase
+        {
+            internal string fullName;
+
+            public override void Delete()
+            {
+                throw new NotImplementedException();
+            }
+
+            public override void Refresh()
+            {
+                throw new NotImplementedException();
+            }
+
+            public override FileAttributes Attributes { get; set; }
+            public override DateTime CreationTime { get; set; }
+            public override DateTime CreationTimeUtc { get; set; }
+            public override bool Exists { get; }
+            public override string Extension { get; }
+
+            public override string FullName
+            {
+                get { return this.fullName; }
+            }
+
+            public override DateTime LastAccessTime { get; set; }
+            public override DateTime LastAccessTimeUtc { get; set; }
+            public override DateTime LastWriteTime { get; set; }
+            public override DateTime LastWriteTimeUtc { get; set; }
+            public override string Name { get; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Pickles/Pickles.Test/FeatureParserTests.cs b/src/Pickles/Pickles.Test/FeatureParserTests.cs
new file mode 100644
index 000000000..56bef6601
--- /dev/null
+++ b/src/Pickles/Pickles.Test/FeatureParserTests.cs
@@ -0,0 +1,41 @@
+//  --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="FeatureParserTests.cs" company="PicklesDoc">
+//  Copyright 2011 Jeffrey Cameron
+//  Copyright 2012-present PicklesDoc team and community contributors
+//
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+using System;
+using NFluent;
+using NUnit.Framework;
+
+namespace PicklesDoc.Pickles.Test
+{
+    [TestFixture]
+    public class FeatureParserTests : BaseFixture
+    {
+        [Test]
+        public void Parse_InvalidFeatureContent_ThrowsFeatureParseException()
+        {
+            var parser = new FeatureParser(Configuration);
+
+            var reader = new System.IO.StringReader("Invalid feature file");
+
+            Check.ThatCode(() => parser.Parse(reader)).Throws<FeatureParseException>()
+                .WithMessage("Unable to parse feature");
+        }
+    }
+}
diff --git a/src/Pickles/Pickles.Test/FileSystemBasedFeatureParserTests.cs b/src/Pickles/Pickles.Test/FileSystemBasedFeatureParserTests.cs
new file mode 100644
index 000000000..08765ed15
--- /dev/null
+++ b/src/Pickles/Pickles.Test/FileSystemBasedFeatureParserTests.cs
@@ -0,0 +1,43 @@
+//  --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="FileSystemBasedFeatureParserTests.cs" company="PicklesDoc">
+//  Copyright 2011 Jeffrey Cameron
+//  Copyright 2012-present PicklesDoc team and community contributors
+//
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+using System;
+using System.IO.Abstractions.TestingHelpers;
+using NFluent;
+using NUnit.Framework;
+
+namespace PicklesDoc.Pickles.Test
+{
+    [TestFixture]
+    public class FileSystemBasedFeatureParserTests : BaseFixture
+    {
+        [Test]
+        public void Parse_InvalidFeatureFile_ThrowsFeatureParseExceptionWithFilename()
+        {
+            FileSystem.AddFile(@"c:\temp\featurefile.feature", new MockFileData("Invalid feature file"));
+            var parser = new FileSystemBasedFeatureParser(new FeatureParser(Configuration), FileSystem);
+
+            Check.ThatCode(() => parser.Parse(@"c:\temp\featurefile.feature")).Throws<FeatureParseException>()
+                .WithMessage(@"There was an error parsing the feature file here: c:\temp\featurefile.feature" +
+                             Environment.NewLine + @"Errormessage was: 'Unable to parse feature'");
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Pickles/Pickles.Test/Formatters/HtmlDocumentationBuilderTests.cs b/src/Pickles/Pickles.Test/Formatters/HtmlDocumentationBuilderTests.cs
index 23732f755..33cf658eb 100644
--- a/src/Pickles/Pickles.Test/Formatters/HtmlDocumentationBuilderTests.cs
+++ b/src/Pickles/Pickles.Test/Formatters/HtmlDocumentationBuilderTests.cs
@@ -35,11 +35,13 @@ public class HtmlDocumentationBuilderTests : BaseFixture
         [Test]
         public void ShouldNotBlowUpWHenParsingEmptyFolder()
         {
+            var rootPath = FileSystem.DirectoryInfo.FromDirectoryName(RootPath);
+
             this.AddFakeFolderStructures();
 
             var configuration = this.Configuration;
             configuration.OutputFolder = this.FileSystem.DirectoryInfo.FromDirectoryName(FileSystemPrefix);
-            var features = Container.Resolve<DirectoryTreeCrawler>().Crawl(RootPath);
+            var features = Container.Resolve<DirectoryTreeCrawler>().Crawl(rootPath, new ParsingReport());
             var builder = Container.Resolve<HtmlDocumentationBuilder>();
 
             builder.Build(features);
diff --git a/src/Pickles/Pickles.Test/Formatters/HtmlScenarioOutlineFormatterTests.cs b/src/Pickles/Pickles.Test/Formatters/HtmlScenarioOutlineFormatterTests.cs
index ef182ca0f..98552104c 100644
--- a/src/Pickles/Pickles.Test/Formatters/HtmlScenarioOutlineFormatterTests.cs
+++ b/src/Pickles/Pickles.Test/Formatters/HtmlScenarioOutlineFormatterTests.cs
@@ -48,7 +48,8 @@ public void Setup()
                 Container.Resolve<HtmlDescriptionFormatter>(),
                 Container.Resolve<HtmlTableFormatter>(),
                 Container.Resolve<HtmlImageResultFormatter>(),
-                fakeTestResults.Object);
+                fakeTestResults.Object,
+                Container.Resolve<ILanguageServicesRegistry>());
         }
 
         #endregion
diff --git a/src/Pickles/Pickles.Test/Formatters/JSON/WhenCreatingAFeatureWithMetaInfo.cs b/src/Pickles/Pickles.Test/Formatters/JSON/WhenCreatingAFeatureWithMetaInfo.cs
index cc00bbb80..2acde7170 100644
--- a/src/Pickles/Pickles.Test/Formatters/JSON/WhenCreatingAFeatureWithMetaInfo.cs
+++ b/src/Pickles/Pickles.Test/Formatters/JSON/WhenCreatingAFeatureWithMetaInfo.cs
@@ -45,7 +45,7 @@ public void Setup()
             this.featureFileInfo = this.FileSystem.FileInfo.FromFileName(FileSystem.Path.Combine(RootPath, FeaturePath));
             this.featureDirectoryNode = new FeatureNode(this.featureFileInfo, RelativePath, this.testFeature);
 
-            this.featureWithMeta = new JsonFeatureWithMetaInfo(this.featureDirectoryNode);
+            this.featureWithMeta = new JsonFeatureWithMetaInfo(this.featureDirectoryNode, new LanguageServicesRegistry());
         }
 
         [Test]
diff --git a/src/Pickles/Pickles.Test/Formatters/JSON/WhenCreatingAFeatureWithMetaInfoAndTestResultInMstestFormat.cs b/src/Pickles/Pickles.Test/Formatters/JSON/WhenCreatingAFeatureWithMetaInfoAndTestResultInMstestFormat.cs
index fa20ffeee..6f1a220a3 100644
--- a/src/Pickles/Pickles.Test/Formatters/JSON/WhenCreatingAFeatureWithMetaInfoAndTestResultInMstestFormat.cs
+++ b/src/Pickles/Pickles.Test/Formatters/JSON/WhenCreatingAFeatureWithMetaInfoAndTestResultInMstestFormat.cs
@@ -40,7 +40,8 @@ public class WhenCreatingAFeatureWithMetaInfoAndTestResultInMstestFormat : BaseF
         public string Setup()
         {
             const string OutputDirectoryName = FileSystemPrefix + @"JSONFeatureOutput";
-            const string RootPath = FileSystemPrefix + @"JSON\Features";
+            var rootPath = FileSystem.DirectoryInfo.FromDirectoryName(FileSystemPrefix + @"JSON\Features");
+
             const string TestResultFilePath = FileSystemPrefix + @"JSON\results-example-failing-and-pasing-mstest.trx";
 
             string filePath = FileSystem.Path.Combine(OutputDirectoryName, JsonDocumentationBuilder.JsonFileName);
@@ -59,7 +60,7 @@ public string Setup()
             var resultFile = RetrieveContentOfFileFromResources(ResourcePrefix + "JSON.results-example-failing-and-pasing-mstest.trx");
             FileSystem.AddFile(TestResultFilePath, resultFile);
 
-            Tree features = Container.Resolve<DirectoryTreeCrawler>().Crawl(RootPath);
+            Tree features = Container.Resolve<DirectoryTreeCrawler>().Crawl(rootPath, new ParsingReport());
 
             var outputDirectory = FileSystem.DirectoryInfo.FromDirectoryName(OutputDirectoryName);
             if (!outputDirectory.Exists)
@@ -78,7 +79,7 @@ public string Setup()
             configuration.AddTestResultFile(FileSystem.FileInfo.FromFileName(TestResultFilePath));
 
             ITestResults testResults = new MsTestResults(configuration, new MsTestSingleResultLoader(), new MsTestScenarioOutlineExampleMatcher());
-            var jsonDocumentationBuilder = new JsonDocumentationBuilder(configuration, testResults, FileSystem);
+            var jsonDocumentationBuilder = new JsonDocumentationBuilder(configuration, testResults, FileSystem, new LanguageServicesRegistry());
             jsonDocumentationBuilder.Build(features);
             string content = FileSystem.File.ReadAllText(filePath);
 
diff --git a/src/Pickles/Pickles.Test/Formatters/JSON/WhenFormattingAFolderStructureWithFeatures.cs b/src/Pickles/Pickles.Test/Formatters/JSON/WhenFormattingAFolderStructureWithFeatures.cs
index 02b45c38b..f244358bc 100644
--- a/src/Pickles/Pickles.Test/Formatters/JSON/WhenFormattingAFolderStructureWithFeatures.cs
+++ b/src/Pickles/Pickles.Test/Formatters/JSON/WhenFormattingAFolderStructureWithFeatures.cs
@@ -35,9 +35,11 @@ public class WhenFormattingAFolderStructureWithFeatures : BaseFixture
 
         public void Setup()
         {
+            var rootPath = FileSystem.DirectoryInfo.FromDirectoryName(FileSystemPrefix);
+
             this.AddFakeFolderStructures();
 
-            Tree features = Container.Resolve<DirectoryTreeCrawler>().Crawl(FileSystemPrefix);
+            Tree features = Container.Resolve<DirectoryTreeCrawler>().Crawl(rootPath, new ParsingReport());
 
             var outputDirectory = FileSystem.DirectoryInfo.FromDirectoryName(OutputDirectory);
             if (!outputDirectory.Exists)
@@ -51,7 +53,7 @@ public void Setup()
                 DocumentationFormat = DocumentationFormat.Json
             };
 
-            var jsonDocumentationBuilder = new JsonDocumentationBuilder(configuration, null, FileSystem);
+            var jsonDocumentationBuilder = new JsonDocumentationBuilder(configuration, null, FileSystem, new LanguageServicesRegistry());
             jsonDocumentationBuilder.Build(features);
         }
 
diff --git a/src/Pickles/Pickles.Test/Formatters/TableOfContentsShouldBeCreatedFromAFolderStructure.cs b/src/Pickles/Pickles.Test/Formatters/TableOfContentsShouldBeCreatedFromAFolderStructure.cs
index 96dd08b25..5ac264e1e 100644
--- a/src/Pickles/Pickles.Test/Formatters/TableOfContentsShouldBeCreatedFromAFolderStructure.cs
+++ b/src/Pickles/Pickles.Test/Formatters/TableOfContentsShouldBeCreatedFromAFolderStructure.cs
@@ -41,9 +41,11 @@ public class TableOfContentsShouldBeCreatedFromAFolderStructure : BaseFixture
 
         public void Setup()
         {
+            var rootPath = FileSystem.DirectoryInfo.FromDirectoryName(RootPath);
+
             this.AddFakeFolderStructures();
 
-            Tree features = Container.Resolve<DirectoryTreeCrawler>().Crawl(RootPath);
+            Tree features = Container.Resolve<DirectoryTreeCrawler>().Crawl(rootPath, new ParsingReport());
 
             var formatter = new HtmlTableOfContentsFormatter(null, this.FileSystem);
             this.toc = formatter.Format(
diff --git a/src/Pickles/Pickles.Test/LanguageServicesRegistryTests.cs b/src/Pickles/Pickles.Test/LanguageServicesRegistryTests.cs
new file mode 100644
index 000000000..4f7286960
--- /dev/null
+++ b/src/Pickles/Pickles.Test/LanguageServicesRegistryTests.cs
@@ -0,0 +1,59 @@
+//  --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="LanguageServicesRegistryTests.cs" company="PicklesDoc">
+//  Copyright 2011 Jeffrey Cameron
+//  Copyright 2012-present PicklesDoc team and community contributors
+//
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+using NFluent;
+using NUnit.Framework;
+
+namespace PicklesDoc.Pickles.Test
+{
+    [TestFixture]
+    public class LanguageServicesRegistryTests
+    {
+        [Test]
+        public void GetLanguageServicesForLanguage_WithEnglish_ReturnsLanguageServicesForEnglish()
+        {
+            var languageServicesRegistry = new LanguageServicesRegistry();
+
+            ILanguageServices languageServices = languageServicesRegistry.GetLanguageServicesForLanguage("en");
+
+            Check.That(languageServices.Language).IsEqualTo("en");
+        }
+
+        [Test]
+        public void DefaultLanguage_ReturnsEnglish()
+        {
+            var languageServicesRegistry = new LanguageServicesRegistry();
+
+            string defaultLanguage = languageServicesRegistry.DefaultLanguage;
+
+            Check.That(defaultLanguage).IsEqualTo("en");
+        }
+
+        [Test]
+        public void GetLanguageServicesForLanguage_WithNullLanguage_ReturnsLanguageServicesForEnglish()
+        {
+            var languageServicesRegistry = new LanguageServicesRegistry();
+
+            ILanguageServices languageServices = languageServicesRegistry.GetLanguageServicesForLanguage(null);
+
+            Check.That(languageServices.Language).IsEqualTo("en");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Pickles/Pickles.Test/ObjectModel/Factory.cs b/src/Pickles/Pickles.Test/ObjectModel/Factory.cs
index ef2475b6f..d9ff5cd16 100644
--- a/src/Pickles/Pickles.Test/ObjectModel/Factory.cs
+++ b/src/Pickles/Pickles.Test/ObjectModel/Factory.cs
@@ -31,7 +31,8 @@ internal class Factory
 
         internal Mapper CreateMapper(string defaultLanguage = "en")
         {
-            var mapper = new Mapper(defaultLanguage);
+            var mapper = this.CreateMapper(new Configuration(), defaultLanguage);
+
             return mapper;
         }
 
@@ -153,14 +154,14 @@ internal G.Background CreateBackground(string name, string description, G.Step[]
             return background;
         }
 
-        internal G.GherkinDocument CreateGherkinDocument(string name, string description, string[] tags = null, G.Background background = null, G.ScenarioDefinition[] scenarioDefinitions = null, G.Comment[] comments = null, G.Location location = null)
+        internal G.GherkinDocument CreateGherkinDocument(string name, string description, string[] tags = null, G.Background background = null, G.ScenarioDefinition[] scenarioDefinitions = null, G.Comment[] comments = null, G.Location location = null, string language = null)
         {
             var nonNullScenarioDefinitions = scenarioDefinitions ?? new G.ScenarioDefinition[0];
             return new G.GherkinDocument(
                 new G.Feature(
                     (tags ?? new string[0]).Select(this.CreateTag).ToArray(),
                     location,
-                    null,
+                    language,
                     "Feature",
                     name,
                     description,
diff --git a/src/Pickles/Pickles.Test/ObjectModel/Json/ExampleToJsonExampleMapperTests.cs b/src/Pickles/Pickles.Test/ObjectModel/Json/ExampleToJsonExampleMapperTests.cs
index f681885f2..08cde4d25 100644
--- a/src/Pickles/Pickles.Test/ObjectModel/Json/ExampleToJsonExampleMapperTests.cs
+++ b/src/Pickles/Pickles.Test/ObjectModel/Json/ExampleToJsonExampleMapperTests.cs
@@ -31,19 +31,21 @@ namespace PicklesDoc.Pickles.Test.ObjectModel.Json
     [TestFixture]
     public class ExampleToJsonExampleMapperTests
     {
+        private const string LanguageDoesNotMatter = "en";
+
         [Test]
         public void Map_Null_ReturnsNull()
         {
             var mapper = CreateMapper();
 
-            JsonExample actual = mapper.Map(null);
+            JsonExample actual = mapper.Map(null, LanguageDoesNotMatter);
 
             Check.That(actual).IsNull();
         }
 
         private static ExampleToJsonExampleMapper CreateMapper()
         {
-            return new ExampleToJsonExampleMapper();
+            return new ExampleToJsonExampleMapper(new LanguageServicesRegistry());
         }
 
         [Test]
@@ -53,7 +55,7 @@ public void Map_AnExample_ReturnsAJsonExample()
 
             var mapper = CreateMapper();
 
-            var actual = mapper.Map(example);
+            var actual = mapper.Map(example, LanguageDoesNotMatter);
 
             Check.That(actual).IsNotNull();
         }
@@ -65,7 +67,7 @@ public void Map_AnExampleWithName_ReturnsAJsonExampleWithName()
 
             var mapper = CreateMapper();
 
-            var actual = mapper.Map(example);
+            var actual = mapper.Map(example, LanguageDoesNotMatter);
 
             Check.That(actual.Name).IsEqualTo("Some name");
         }
@@ -77,7 +79,7 @@ public void Map_AnExampleWithDescription_ReturnsAJsonExampleWithName()
 
             var mapper = CreateMapper();
 
-            var actual = mapper.Map(example);
+            var actual = mapper.Map(example, LanguageDoesNotMatter);
 
             Check.That(actual.Description).IsEqualTo("Some description");
         }
@@ -89,7 +91,7 @@ public void Map_AnExampleWithTags_ReturnsAJsonExampleWithTags()
 
             var mapper = CreateMapper();
 
-            var actual = mapper.Map(example);
+            var actual = mapper.Map(example, LanguageDoesNotMatter);
 
             Check.That(actual.Tags).ContainsExactly("tag1", "tag2");
         }
@@ -104,9 +106,37 @@ public void Map_AnExampleWithTableArgument_ReturnsAJsonExampleWithTableArgument(
 
             var mapper = CreateMapper();
 
-            var actual = mapper.Map(example);
+            var actual = mapper.Map(example, LanguageDoesNotMatter);
 
             Check.That(actual.TableArgument.HeaderRow).ContainsExactly("Placeholder 1", "Placeholder 2");
         }
+
+        [Test]
+        public void Map_EnglishFeature_SetsNativeKeywordToExamples()
+        {
+            var example = new Example
+            {
+                TableArgument = new Table { HeaderRow = new TableRow("Placeholder 1", "Placeholder 2") }
+            };
+
+            var mapper = CreateMapper();
+            var actual = mapper.Map(example, "en");
+
+            Check.That(actual.NativeKeyword).IsEqualTo("Examples");
+        }
+
+        [Test]
+        public void Map_DutchFeature_SetsNativeKeywordToExamples()
+        {
+            var example = new Example
+            {
+                TableArgument = new Table { HeaderRow = new TableRow("Placeholder 1", "Placeholder 2") }
+            };
+
+            var mapper = CreateMapper();
+            var actual = mapper.Map(example, "nl");
+
+            Check.That(actual.NativeKeyword).IsEqualTo("Voorbeelden");
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Pickles/Pickles.Test/ObjectModel/Json/FeatureToJsonFeatureMapperTests.cs b/src/Pickles/Pickles.Test/ObjectModel/Json/FeatureToJsonFeatureMapperTests.cs
index ea23ef51f..bd00ef977 100644
--- a/src/Pickles/Pickles.Test/ObjectModel/Json/FeatureToJsonFeatureMapperTests.cs
+++ b/src/Pickles/Pickles.Test/ObjectModel/Json/FeatureToJsonFeatureMapperTests.cs
@@ -44,7 +44,7 @@ public void Map_NullFeature_ReturnsNullJsonFeature()
 
         private static FeatureToJsonFeatureMapper CreateMapper()
         {
-            return new FeatureToJsonFeatureMapper();
+            return new FeatureToJsonFeatureMapper(new LanguageServicesRegistry());
         }
 
         [Test]
diff --git a/src/Pickles/Pickles.Test/ObjectModel/Json/JsonScenarioTests.cs b/src/Pickles/Pickles.Test/ObjectModel/Json/JsonScenarioTests.cs
index 5f91951ba..0a98e687c 100644
--- a/src/Pickles/Pickles.Test/ObjectModel/Json/JsonScenarioTests.cs
+++ b/src/Pickles/Pickles.Test/ObjectModel/Json/JsonScenarioTests.cs
@@ -41,7 +41,7 @@ public void MapToScenario_Always_MapsFeatureProperty()
                                   FeatureElements = { new Scenario { Name = "My Feature" } }
                               };
 
-            var mapper = new JsonMapper();
+            var mapper = new JsonMapper(new LanguageServicesRegistry());
 
             var mappedFeature = mapper.Map(feature);
 
diff --git a/src/Pickles/Pickles.Test/ObjectModel/Json/ScenarioOutlineToJsonScenarioOutlineMapperTests.cs b/src/Pickles/Pickles.Test/ObjectModel/Json/ScenarioOutlineToJsonScenarioOutlineMapperTests.cs
index b5e90ceb4..57336e8cc 100644
--- a/src/Pickles/Pickles.Test/ObjectModel/Json/ScenarioOutlineToJsonScenarioOutlineMapperTests.cs
+++ b/src/Pickles/Pickles.Test/ObjectModel/Json/ScenarioOutlineToJsonScenarioOutlineMapperTests.cs
@@ -43,7 +43,7 @@ public void Map_Null_ReturnsNull()
 
         private static ScenarioOutlineToJsonScenarioOutlineMapper CreateMapper()
         {
-            return new ScenarioOutlineToJsonScenarioOutlineMapper();
+            return new ScenarioOutlineToJsonScenarioOutlineMapper(new LanguageServicesRegistry());
         }
 
         [Test]
diff --git a/src/Pickles/Pickles.Test/ObjectModel/MapperTestsForDataTable.cs b/src/Pickles/Pickles.Test/ObjectModel/MapperTestsForDataTable.cs
index d2930c40a..733a870b9 100644
--- a/src/Pickles/Pickles.Test/ObjectModel/MapperTestsForDataTable.cs
+++ b/src/Pickles/Pickles.Test/ObjectModel/MapperTestsForDataTable.cs
@@ -45,7 +45,7 @@ public void MapToStringTableCell_TableCellWithValue_ReturnsThatValue()
         [Test]
         public void MapToStringTableCell_NullTableCell_ReturnsNull()
         {
-            var mapper = new Mapper();
+            var mapper = factory.CreateMapper();
 
             string result = mapper.MapToString((G.TableCell)null);
 
@@ -55,7 +55,7 @@ public void MapToStringTableCell_NullTableCell_ReturnsNull()
         [Test]
         public void MapToTableRow_NullTableRow_ReturnsNull()
         {
-            var mapper = new Mapper();
+            var mapper = factory.CreateMapper();
 
             TableRow result = mapper.MapToTableRow(null);
 
@@ -72,7 +72,7 @@ public void MapToTableRow_RowWithCellValues_ReturnsRowContainingThoseValues()
                     "second cell"
                 });
 
-            var mapper = new Mapper();
+            var mapper = factory.CreateMapper();
 
             var result = mapper.MapToTableRow(row);
 
@@ -82,7 +82,7 @@ public void MapToTableRow_RowWithCellValues_ReturnsRowContainingThoseValues()
         [Test]
         public void MapToTable_NullDataTable_ReturnsNullTable()
         {
-            var mapper = new Mapper();
+            var mapper = factory.CreateMapper();
 
             Table result = mapper.MapToTable((G.DataTable) null);
 
@@ -99,7 +99,7 @@ public void MapToTable_DataTableWithThreeRows_ReturnsTableWithHeaderRowAndTwoRow
                 new[] { "Second row, first cell", "Second row, second cell" }
             });
 
-            var mapper = new Mapper();
+            var mapper = factory.CreateMapper();
 
             var result = mapper.MapToTable(dataTable);
 
diff --git a/src/Pickles/Pickles.Test/ObjectModel/MapperTestsForFeature.cs b/src/Pickles/Pickles.Test/ObjectModel/MapperTestsForFeature.cs
index 2a0b3d4d7..4fd4c2c8a 100644
--- a/src/Pickles/Pickles.Test/ObjectModel/MapperTestsForFeature.cs
+++ b/src/Pickles/Pickles.Test/ObjectModel/MapperTestsForFeature.cs
@@ -216,5 +216,29 @@ public void MapToFeature_FeatureWithComments_ReturnsFeatureWithoutComments_WhenC
             Check.That(scenario.Steps[2].Comments.Count).IsEqualTo(0);
             Check.That(scenario.Steps[3].Comments.Count).IsEqualTo(0);
         }
+
+        [Test]
+        public void MapToFeature_FeatureWithoutLanguage_ReturnsFeatureWithEnglish()
+        {
+            var gherkinDocument = this.factory.CreateGherkinDocument("My Feature", null);
+
+            var mapper = this.factory.CreateMapper();
+
+            var result = mapper.MapToFeature(gherkinDocument);
+
+            Check.That(result.Language).Equals("en");
+        }
+
+        [Test]
+        public void MapToFeature_FeatureWithDutchLanguage_ReturnsFeatureWithDutch()
+        {
+            var gherkinDocument = this.factory.CreateGherkinDocument("My Feature", null, language: "nl");
+
+            var mapper = this.factory.CreateMapper();
+
+            var result = mapper.MapToFeature(gherkinDocument);
+
+            Check.That(result.Language).Equals("nl");
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Pickles/Pickles.Test/Pickles.Test.csproj b/src/Pickles/Pickles.Test/Pickles.Test.csproj
index 2e0914038..822fa9422 100644
--- a/src/Pickles/Pickles.Test/Pickles.Test.csproj
+++ b/src/Pickles/Pickles.Test/Pickles.Test.csproj
@@ -98,11 +98,16 @@
     </Compile>
     <Compile Include="AssertExtensions.cs" />
     <Compile Include="BaseFixture.cs" />
+    <Compile Include="ConfigurationTests.cs" />
     <Compile Include="DataStructures\TreeTests.cs" />
     <Compile Include="DescriptionProcessorTests.cs" />
     <Compile Include="DirectoryCrawlers\ImageFileDetectorTests.cs" />
     <Compile Include="DirectoryCrawlers\RelevantFileDetectorTests.cs" />
+    <Compile Include="FeatureNodeFactoryTests.cs" />
+    <Compile Include="FeatureParserTests.cs" />
+    <Compile Include="FileSystemBasedFeatureParserTests.cs" />
     <Compile Include="GlobalSuppressions.cs" />
+    <Compile Include="LanguageServicesRegistryTests.cs" />
     <Compile Include="ObjectModel\Factory.cs" />
     <Compile Include="ObjectModel\Json\CommentToJsonCommentMapperTests.cs" />
     <Compile Include="ObjectModel\Json\ExampleToJsonExampleMapperTests.cs" />
diff --git a/src/Pickles/Pickles.Test/WhenCrawlingFoldersForFeatures.cs b/src/Pickles/Pickles.Test/WhenCrawlingFoldersForFeatures.cs
index 063be49f9..1954b9268 100644
--- a/src/Pickles/Pickles.Test/WhenCrawlingFoldersForFeatures.cs
+++ b/src/Pickles/Pickles.Test/WhenCrawlingFoldersForFeatures.cs
@@ -35,8 +35,8 @@ public void Then_can_crawl_all_folders_including_subfolders_for_features_success
         {
             this.AddFakeFolderStructures();
 
-            string rootPath = FileSystemPrefix + @"FeatureCrawlerTests";
-            Tree features = Container.Resolve<DirectoryTreeCrawler>().Crawl(rootPath);
+            var rootPath = FileSystem.DirectoryInfo.FromDirectoryName(FileSystemPrefix + @"FeatureCrawlerTests");
+            Tree features = Container.Resolve<DirectoryTreeCrawler>().Crawl(rootPath, new ParsingReport());
 
             Check.That(features).IsNotNull();
 
diff --git a/src/Pickles/Pickles.Test/WhenParsingLocalizedFeatureFiles.cs b/src/Pickles/Pickles.Test/WhenParsingLocalizedFeatureFiles.cs
index 30be8f307..cf743bdff 100644
--- a/src/Pickles/Pickles.Test/WhenParsingLocalizedFeatureFiles.cs
+++ b/src/Pickles/Pickles.Test/WhenParsingLocalizedFeatureFiles.cs
@@ -52,7 +52,7 @@ När den körs
         Så skall jag se att det inträffat";
 
             var configuration = this.Configuration;
-            var parser = new FeatureParser(FileSystem, configuration);
+            var parser = this.CreateParser(configuration);
             Feature feature = parser.Parse(new StringReader(featureText));
 
             Check.That(feature).IsNotNull();
@@ -88,6 +88,11 @@ Vill jag skriva mina krav på svenska
             Check.That(thenStep.TableArgument).IsNull();
         }
 
+        private FeatureParser CreateParser(IConfiguration configuration)
+        {
+            return new FeatureParser(configuration);
+        }
+
         [Test]
         public void WhenSettingTheLanguageInTheConfiguration_ThenCanParseMostBasicFeatureSuccessfully()
         {
@@ -107,7 +112,7 @@ När den körs
 
             configuration.Language = "sv";
 
-            var parser = new FeatureParser(FileSystem, configuration);
+            var parser = this.CreateParser(configuration);
             Feature feature = parser.Parse(new StringReader(featureText));
 
             Check.That(feature).IsNotNull();
@@ -142,6 +147,7 @@ Vill jag skriva mina krav på svenska
             Check.That(thenStep.DocStringArgument).IsNull();
             Check.That(thenStep.TableArgument).IsNull();
         }
+
         [Test]
         public void WhenIndicatingTheLanguageAndCultureInTheFeature_ThenCanParseTheFeature()
         {
@@ -156,7 +162,7 @@ Als ik plus druk
     Dan moet het resultaat 120 zijn";
 
             var configuration = this.Configuration;
-            var parser = new FeatureParser(FileSystem, configuration);
+            var parser = this.CreateParser(configuration);
             Feature feature = parser.Parse(new StringReader(featureText));
 
             Check.That(feature).IsNotNull();
diff --git a/src/Pickles/Pickles/Configuration.cs b/src/Pickles/Pickles/Configuration.cs
index e444c3049..464f96517 100644
--- a/src/Pickles/Pickles/Configuration.cs
+++ b/src/Pickles/Pickles/Configuration.cs
@@ -34,9 +34,14 @@ public class Configuration : IConfiguration
         private readonly List<FileInfoBase> testResultsFiles;
 
         public Configuration()
+            : this(new LanguageServicesRegistry())
+        {
+        }
+
+        public Configuration(ILanguageServicesRegistry languageServicesRegistry)
         {
             this.testResultsFiles = new List<FileInfoBase>();
-            this.Language = LanguageServices.DefaultLanguage;
+            this.Language = languageServicesRegistry.DefaultLanguage;
         }
 
         public DirectoryInfoBase FeatureFolder { get; set; }
diff --git a/src/Pickles/Pickles/CultureAwareDialectProvider.cs b/src/Pickles/Pickles/CultureAwareDialectProvider.cs
index be2ef26a7..9465d908e 100644
--- a/src/Pickles/Pickles/CultureAwareDialectProvider.cs
+++ b/src/Pickles/Pickles/CultureAwareDialectProvider.cs
@@ -27,7 +27,7 @@ namespace PicklesDoc.Pickles
 {
     public class CultureAwareDialectProvider : GherkinDialectProvider
     {
-        public CultureAwareDialectProvider(string defaultLanguage = "en") : base(defaultLanguage)
+        public CultureAwareDialectProvider(string defaultLanguage) : base(defaultLanguage)
         {
         }
 
diff --git a/src/Pickles/Pickles/DirectoryCrawler/DirectoryTreeCrawler.cs b/src/Pickles/Pickles/DirectoryCrawler/DirectoryTreeCrawler.cs
index d16fe1e4b..dda7673c0 100644
--- a/src/Pickles/Pickles/DirectoryCrawler/DirectoryTreeCrawler.cs
+++ b/src/Pickles/Pickles/DirectoryCrawler/DirectoryTreeCrawler.cs
@@ -44,20 +44,15 @@ public DirectoryTreeCrawler(RelevantFileDetector relevantFileDetector, FeatureNo
             this.fileSystem = fileSystem;
         }
 
-        public Tree Crawl(string directory)
+        public Tree Crawl(DirectoryInfoBase directory, ParsingReport parsingReport)
         {
-            return this.Crawl(this.fileSystem.DirectoryInfo.FromDirectoryName(directory), null);
+            return this.Crawl(directory, null, parsingReport);
         }
 
-        public Tree Crawl(DirectoryInfoBase directory)
-        {
-            return this.Crawl(directory, null);
-        }
-
-        private Tree Crawl(DirectoryInfoBase directory, INode rootNode)
+        private Tree Crawl(DirectoryInfoBase directory, INode rootNode, ParsingReport parsingReport)
         {
             INode currentNode =
-                this.featureNodeFactory.Create(rootNode != null ? rootNode.OriginalLocation : null, directory);
+                this.featureNodeFactory.Create(rootNode != null ? rootNode.OriginalLocation : null, directory, parsingReport);
 
             if (rootNode == null)
             {
@@ -66,9 +61,9 @@ private Tree Crawl(DirectoryInfoBase directory, INode rootNode)
 
             var tree = new Tree(currentNode);
 
-            var filesAreFound = this.CollectFiles(directory, rootNode, tree);
+            var filesAreFound = this.CollectFiles(directory, rootNode, tree, parsingReport);
 
-            var directoriesAreFound = this.CollectDirectories(directory, rootNode, tree);
+            var directoriesAreFound = this.CollectDirectories(directory, rootNode, tree, parsingReport);
 
             if (!filesAreFound && !directoriesAreFound)
             {
@@ -78,13 +73,13 @@ private Tree Crawl(DirectoryInfoBase directory, INode rootNode)
             return tree;
         }
 
-        private bool CollectDirectories(DirectoryInfoBase directory, INode rootNode, Tree tree)
+        private bool CollectDirectories(DirectoryInfoBase directory, INode rootNode, Tree tree, ParsingReport parsingReport)
         {
             List<Tree> collectedNodes = new List<Tree>();
 
             foreach (DirectoryInfoBase subDirectory in directory.GetDirectories().OrderBy(di => di.Name))
             {
-                Tree subTree = this.Crawl(subDirectory, rootNode);
+                Tree subTree = this.Crawl(subDirectory, rootNode, parsingReport);
                 if (subTree != null)
                 {
                     collectedNodes.Add(subTree);
@@ -99,13 +94,13 @@ private bool CollectDirectories(DirectoryInfoBase directory, INode rootNode, Tre
             return collectedNodes.Count > 0;
         }
 
-        private bool CollectFiles(DirectoryInfoBase directory, INode rootNode, Tree tree)
+        private bool CollectFiles(DirectoryInfoBase directory, INode rootNode, Tree tree, ParsingReport parsingReport)
         {
             List<INode> collectedNodes = new List<INode>();
 
             foreach (FileInfoBase file in directory.GetFiles().Where(file => this.relevantFileDetector.IsRelevant(file)))
             {
-                INode node = this.featureNodeFactory.Create(rootNode.OriginalLocation, file);
+                INode node = this.featureNodeFactory.Create(rootNode.OriginalLocation, file, parsingReport);
                 if(node != null)
                     collectedNodes.Add(node);
             }
diff --git a/src/Pickles/Pickles/DirectoryCrawler/FeatureNodeFactory.cs b/src/Pickles/Pickles/DirectoryCrawler/FeatureNodeFactory.cs
index 1292f1bbe..8a1274486 100644
--- a/src/Pickles/Pickles/DirectoryCrawler/FeatureNodeFactory.cs
+++ b/src/Pickles/Pickles/DirectoryCrawler/FeatureNodeFactory.cs
@@ -20,8 +20,9 @@
 
 using System;
 using System.IO.Abstractions;
+using System.Reflection;
 using System.Xml.Linq;
-
+using NLog;
 using PicklesDoc.Pickles.DocumentationBuilders.Html;
 using PicklesDoc.Pickles.Extensions;
 using PicklesDoc.Pickles.ObjectModel;
@@ -30,12 +31,14 @@ namespace PicklesDoc.Pickles.DirectoryCrawler
 {
     public class FeatureNodeFactory
     {
-        private readonly FeatureParser featureParser;
+        private static readonly Logger Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.Name);
+
+        private readonly FileSystemBasedFeatureParser featureParser;
         private readonly HtmlMarkdownFormatter htmlMarkdownFormatter;
         private readonly RelevantFileDetector relevantFileDetector;
         private readonly IFileSystem fileSystem;
 
-        public FeatureNodeFactory(RelevantFileDetector relevantFileDetector, FeatureParser featureParser, HtmlMarkdownFormatter htmlMarkdownFormatter, IFileSystem fileSystem)
+        public FeatureNodeFactory(RelevantFileDetector relevantFileDetector, FileSystemBasedFeatureParser featureParser, HtmlMarkdownFormatter htmlMarkdownFormatter, IFileSystem fileSystem)
         {
             this.relevantFileDetector = relevantFileDetector;
             this.featureParser = featureParser;
@@ -43,7 +46,7 @@ public FeatureNodeFactory(RelevantFileDetector relevantFileDetector, FeaturePars
             this.fileSystem = fileSystem;
         }
 
-        public INode Create(FileSystemInfoBase root, FileSystemInfoBase location)
+        public INode Create(FileSystemInfoBase root, FileSystemInfoBase location, ParsingReport report)
         {
             string relativePathFromRoot = root == null ? @".\" : PathExtensions.MakeRelativePath(root, location, this.fileSystem);
 
@@ -54,22 +57,39 @@ public INode Create(FileSystemInfoBase root, FileSystemInfoBase location)
             }
 
             var file = location as FileInfoBase;
-            if (this.relevantFileDetector.IsFeatureFile(file))
-            {
-                Feature feature = this.featureParser.Parse(file.FullName);
-                return feature != null ? new FeatureNode(file, relativePathFromRoot, feature) : null;
-            }
-            else if (this.relevantFileDetector.IsMarkdownFile(file))
-            {
-                XElement markdownContent = this.htmlMarkdownFormatter.Format(this.fileSystem.File.ReadAllText(file.FullName));
-                return new MarkdownNode(file, relativePathFromRoot, markdownContent);
-            }
-            else if (this.relevantFileDetector.IsImageFile(file))
+
+            if (file != null)
             {
-                return new ImageNode(file, relativePathFromRoot);
+                if (this.relevantFileDetector.IsFeatureFile(file))
+                {
+                    try
+                    {
+                        Feature feature = this.featureParser.Parse(file.FullName);
+                        return feature != null ? new FeatureNode(file, relativePathFromRoot, feature) : null;
+                    }
+                    catch (FeatureParseException exception)
+                    {
+                        report.Add(exception.Message);
+                        Log.Error(exception.Message);
+                        return null;
+                    }
+                }
+                else if (this.relevantFileDetector.IsMarkdownFile(file))
+                {
+                    XElement markdownContent =
+                        this.htmlMarkdownFormatter.Format(this.fileSystem.File.ReadAllText(file.FullName));
+                    return new MarkdownNode(file, relativePathFromRoot, markdownContent);
+                }
+                else if (this.relevantFileDetector.IsImageFile(file))
+                {
+                    return new ImageNode(file, relativePathFromRoot);
+                }
             }
 
-            throw new InvalidOperationException("Cannot create an IItemNode-derived object for " + file.FullName);
+            var message = "Cannot create an IItemNode-derived object for " + location.FullName;
+            report.Add(message);
+            Log.Error(message);
+            return null;
         }
     }
 }
diff --git a/src/Pickles/Pickles/DirectoryCrawler/ParsingReport.cs b/src/Pickles/Pickles/DirectoryCrawler/ParsingReport.cs
new file mode 100644
index 000000000..f91d85ad9
--- /dev/null
+++ b/src/Pickles/Pickles/DirectoryCrawler/ParsingReport.cs
@@ -0,0 +1,29 @@
+//  --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="ParsingReport.cs" company="PicklesDoc">
+//  Copyright 2011 Jeffrey Cameron
+//  Copyright 2012-present PicklesDoc team and community contributors
+//
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+
+namespace PicklesDoc.Pickles.DirectoryCrawler
+{
+    public class ParsingReport : List<string>
+    {
+    }
+}
diff --git a/src/Pickles/Pickles/FeatureParser.cs b/src/Pickles/Pickles/FeatureParser.cs
index 47d6189b5..ecdab9bc9 100644
--- a/src/Pickles/Pickles/FeatureParser.cs
+++ b/src/Pickles/Pickles/FeatureParser.cs
@@ -19,7 +19,6 @@
 //  --------------------------------------------------------------------------------------------------------------------
 
 using System;
-using System.IO.Abstractions;
 using System.Linq;
 using PicklesDoc.Pickles.ObjectModel;
 
@@ -29,57 +28,38 @@ namespace PicklesDoc.Pickles
 {
     public class FeatureParser
     {
-        private readonly IFileSystem fileSystem;
-
         private readonly IConfiguration configuration;
 
         private readonly DescriptionProcessor descriptionProcessor = new DescriptionProcessor();
 
-        public FeatureParser(IFileSystem fileSystem, IConfiguration configuration)
+        public FeatureParser(IConfiguration configuration)
         {
-            this.fileSystem = fileSystem;
             this.configuration = configuration;
         }
 
-        public Feature Parse(string filename)
-        {
-            Feature feature = null;
-            using (var reader = this.fileSystem.FileInfo.FromFileName(filename).OpenText())
-            {
-                try
-                {
-                    feature = this.Parse(reader);
-                }
-                catch (Exception e)
-                {
-                    string message =
-                        $"There was an error parsing the feature file here: {this.fileSystem.Path.GetFullPath(filename)}" + Environment.NewLine +
-                        $"Errormessage was:'{e.Message}'";
-                    throw new FeatureParseException(message, e);
-                }
-
-                reader.Close();
-            }
-
-            return feature;
-        }
-
         public Feature Parse(TextReader featureFileReader)
         {
             var language = this.DetermineLanguage();
             var gherkinParser = new Gherkin.Parser();
 
-            Gherkin.Ast.GherkinDocument gherkinDocument = gherkinParser.Parse(
-                new Gherkin.TokenScanner(featureFileReader),
-                new Gherkin.TokenMatcher(new CultureAwareDialectProvider(language)));
+            try
+            {
+                Gherkin.Ast.GherkinDocument gherkinDocument = gherkinParser.Parse(
+                    new Gherkin.TokenScanner(featureFileReader),
+                    new Gherkin.TokenMatcher(new CultureAwareDialectProvider(language)));
 
-            Feature result = new Mapper(this.configuration, gherkinDocument.Feature.Language).MapToFeature(gherkinDocument);
-            result = this.RemoveFeatureWithExcludeTags(result);
+                Feature result = new Mapper(this.configuration, gherkinDocument.Feature.Language).MapToFeature(gherkinDocument);
+                result = this.RemoveFeatureWithExcludeTags(result);
 
-            if (result != null)
-                this.descriptionProcessor.Process(result);
+                if (result != null)
+                    this.descriptionProcessor.Process(result);
 
-            return result;
+                return result;
+            }
+            catch (Gherkin.CompositeParserException exception)
+            {
+                throw new FeatureParseException("Unable to parse feature", exception);
+            }
         }
 
         private string DetermineLanguage()
diff --git a/src/Pickles/Pickles/FileSystemBasedFeatureParser.cs b/src/Pickles/Pickles/FileSystemBasedFeatureParser.cs
new file mode 100644
index 000000000..76cb61350
--- /dev/null
+++ b/src/Pickles/Pickles/FileSystemBasedFeatureParser.cs
@@ -0,0 +1,62 @@
+//  --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="FileSystemBasedFeatureParser.cs" company="PicklesDoc">
+//  Copyright 2011 Jeffrey Cameron
+//  Copyright 2012-present PicklesDoc team and community contributors
+//
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+using System;
+using System.IO.Abstractions;
+using PicklesDoc.Pickles.ObjectModel;
+
+namespace PicklesDoc.Pickles
+{
+    public class FileSystemBasedFeatureParser
+    {
+        private readonly IFileSystem fileSystem;
+
+        private readonly FeatureParser parser;
+
+        public FileSystemBasedFeatureParser(FeatureParser parser, IFileSystem fileSystem)
+        {
+            this.parser = parser;
+            this.fileSystem = fileSystem;
+        }
+
+        public Feature Parse(string filename)
+        {
+            Feature feature = null;
+            using (var reader = this.fileSystem.FileInfo.FromFileName(filename).OpenText())
+            {
+                try
+                {
+                    feature = this.parser.Parse(reader);
+                }
+                catch (FeatureParseException e)
+                {
+                    string message =
+                        $"There was an error parsing the feature file here: {this.fileSystem.Path.GetFullPath(filename)}" + Environment.NewLine +
+                        $"Errormessage was: '{e.Message}'";
+                    throw new FeatureParseException(message, e);
+                }
+
+                reader.Close();
+            }
+
+            return feature;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Pickles/Pickles/LanguageServices.cs b/src/Pickles/Pickles/LanguageServices.cs
index 1cbf8ba6a..a36d5d4e3 100644
--- a/src/Pickles/Pickles/LanguageServices.cs
+++ b/src/Pickles/Pickles/LanguageServices.cs
@@ -26,9 +26,7 @@ namespace PicklesDoc.Pickles
 {
     public class LanguageServices : ILanguageServices
     {
-        public const string DefaultLanguage = "en";
-
-        private readonly Lazy<GherkinDialect> languageLazy;
+        private readonly Lazy<GherkinDialect> gherkinDialectLazy;
 
         private readonly Lazy<string[]> givenStepKeywordsLazy;
         private readonly Lazy<string[]> whenStepKeywordsLazy;
@@ -42,15 +40,16 @@ public LanguageServices(IConfiguration configuration)
         {
         }
 
-        public LanguageServices(string language = DefaultLanguage)
+        public LanguageServices(string language)
         {
-            this.languageLazy = new Lazy<GherkinDialect>(() => new GherkinDialectProvider().GetDialect(language, null));
-            this.whenStepKeywordsLazy = new Lazy<string[]>(() => this.Language.WhenStepKeywords.Select(s => s.Trim()).ToArray());
-            this.givenStepKeywordsLazy = new Lazy<string[]>(() => this.Language.GivenStepKeywords.Select(s => s.Trim()).ToArray());
-            this.thenStepKeywordsLazy = new Lazy<string[]>(() => this.Language.ThenStepKeywords.Select(s => s.Trim()).ToArray());
-            this.andStepKeywordsLazy = new Lazy<string[]>(() => this.Language.AndStepKeywords.Select(s => s.Trim()).ToArray());
-            this.butStepKeywordsLazy = new Lazy<string[]>(() => this.Language.ButStepKeywords.Select(s => s.Trim()).ToArray());
-            this.backgroundKeywordsLazy = new Lazy<string[]>(() => this.Language.BackgroundKeywords.Select(s => s.Trim()).ToArray());
+            this.gherkinDialectLazy = new Lazy<GherkinDialect>(() => new GherkinDialectProvider().GetDialect(language, null));
+            this.whenStepKeywordsLazy = new Lazy<string[]>(() => this.GherkinDialect.WhenStepKeywords.Select(s => s.Trim()).ToArray());
+            this.givenStepKeywordsLazy = new Lazy<string[]>(() => this.GherkinDialect.GivenStepKeywords.Select(s => s.Trim()).ToArray());
+            this.thenStepKeywordsLazy = new Lazy<string[]>(() => this.GherkinDialect.ThenStepKeywords.Select(s => s.Trim()).ToArray());
+            this.andStepKeywordsLazy = new Lazy<string[]>(() => this.GherkinDialect.AndStepKeywords.Select(s => s.Trim()).ToArray());
+            this.butStepKeywordsLazy = new Lazy<string[]>(() => this.GherkinDialect.ButStepKeywords.Select(s => s.Trim()).ToArray());
+            this.backgroundKeywordsLazy = new Lazy<string[]>(() => this.GherkinDialect.BackgroundKeywords.Select(s => s.Trim()).ToArray());
+            this.ExamplesKeywords = this.GherkinDialect.ExamplesKeywords.Select(s => s.Trim()).ToArray();
         }
 
         public string[] GivenStepKeywords
@@ -83,9 +82,16 @@ public string[] BackgroundKeywords
             get { return this.backgroundKeywordsLazy.Value; }
         }
 
-        private GherkinDialect Language
+        private GherkinDialect GherkinDialect
+        {
+            get { return this.gherkinDialectLazy.Value; }
+        }
+
+        public string[] ExamplesKeywords { get; }
+
+        public string Language
         {
-            get { return this.languageLazy.Value; }
+            get { return this.GherkinDialect.Language; }
         }
     }
 }
diff --git a/src/Pickles/Pickles/LanguageServicesRegistry.cs b/src/Pickles/Pickles/LanguageServicesRegistry.cs
new file mode 100644
index 000000000..e83f575ef
--- /dev/null
+++ b/src/Pickles/Pickles/LanguageServicesRegistry.cs
@@ -0,0 +1,34 @@
+//  --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="LanguageServicesRegistry.cs" company="PicklesDoc">
+//  Copyright 2011 Jeffrey Cameron
+//  Copyright 2012-present PicklesDoc team and community contributors
+//
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+namespace PicklesDoc.Pickles
+{
+    public class LanguageServicesRegistry : ILanguageServicesRegistry
+    {
+        public ILanguageServices GetLanguageServicesForLanguage(string language)
+        {
+            return new LanguageServices(language ?? DefaultLanguage);
+        }
+
+        public string DefaultLanguage
+        {
+            get { return "en"; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Pickles/Pickles/ObjectModel/Mapper.cs b/src/Pickles/Pickles/ObjectModel/Mapper.cs
index 928464012..d3c3a83e1 100644
--- a/src/Pickles/Pickles/ObjectModel/Mapper.cs
+++ b/src/Pickles/Pickles/ObjectModel/Mapper.cs
@@ -21,11 +21,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+
+using PicklesDoc.Pickles.Extensions;
+
 using G = Gherkin.Ast;
 
 namespace PicklesDoc.Pickles.ObjectModel
 {
-    using PicklesDoc.Pickles.Extensions;
 
     public class Mapper
     {
@@ -33,12 +35,7 @@ public class Mapper
 
         private readonly ILanguageServices languageServices;
 
-        public Mapper(string featureLanguage = LanguageServices.DefaultLanguage)
-            : this(new Configuration(), featureLanguage)
-        {
-        }
-
-        public Mapper(IConfiguration configuration, string featureLanguage = LanguageServices.DefaultLanguage)
+        public Mapper(IConfiguration configuration, string featureLanguage)
         {
             this.configuration = configuration;
             this.languageServices = new LanguageServices(featureLanguage);
@@ -304,6 +301,8 @@ public Feature MapToFeature(G.GherkinDocument gherkinDocument)
                 feature.Background.Feature = feature;
             }
 
+            feature.Language = gherkinDocument.Feature.Language ?? "en";
+
             return feature;
         }
 
diff --git a/src/Pickles/Pickles/Pickles.csproj b/src/Pickles/Pickles/Pickles.csproj
index 7f72af5da..43f626912 100644
--- a/src/Pickles/Pickles/Pickles.csproj
+++ b/src/Pickles/Pickles/Pickles.csproj
@@ -100,13 +100,16 @@
     <Compile Include="CultureAwareDialectProvider.cs" />
     <Compile Include="DescriptionProcessor.cs" />
     <Compile Include="DirectoryCrawler\ImageFileDetector.cs" />
+    <Compile Include="DirectoryCrawler\ParsingReport.cs" />
     <Compile Include="Extensions\PathExtensions.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
     <Compile Include="DirectoryCrawler\FeatureNodeFactory.cs" />
     <Compile Include="FeatureParseException.cs" />
     <Compile Include="FeatureToggles\AlternateMarkdownProvider.cs" />
+    <Compile Include="FileSystemBasedFeatureParser.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="LanguageServices.cs" />
+    <Compile Include="LanguageServicesRegistry.cs" />
     <Compile Include="MarkdownProvider.cs" />
     <Compile Include="ObjectModel\Mapper.cs" />
     <Compile Include="DirectoryCrawler\DirectoryTreeCrawler.cs" />
diff --git a/src/Pickles/Pickles/PicklesModule.cs b/src/Pickles/Pickles/PicklesModule.cs
index 5331bf18c..965b5e773 100644
--- a/src/Pickles/Pickles/PicklesModule.cs
+++ b/src/Pickles/Pickles/PicklesModule.cs
@@ -137,6 +137,7 @@ protected override void Load(ContainerBuilder builder)
             }).SingleInstance();
 
             builder.RegisterType<LanguageServices>().As<ILanguageServices>().UsingConstructor(typeof(IConfiguration)).SingleInstance();
+            builder.RegisterType<LanguageServicesRegistry>().As<ILanguageServicesRegistry>().SingleInstance();
 
             builder.RegisterType<HtmlMarkdownFormatter>().SingleInstance();
             builder.RegisterType<HtmlResourceWriter>().SingleInstance();
diff --git a/src/Pickles/Pickles/Runner.cs b/src/Pickles/Pickles/Runner.cs
index 1f8089e86..f3a0714e2 100644
--- a/src/Pickles/Pickles/Runner.cs
+++ b/src/Pickles/Pickles/Runner.cs
@@ -44,7 +44,15 @@ public void Run(IContainer container)
             }
 
             var featureCrawler = container.Resolve<DirectoryTreeCrawler>();
-            Tree features = featureCrawler.Crawl(configuration.FeatureFolder);
+            var parsingReport = new ParsingReport();
+
+            Tree features = featureCrawler.Crawl(configuration.FeatureFolder, parsingReport);
+
+            if (parsingReport.Any())
+            {
+                var error = $"Some files ({parsingReport.Count}) were not parsed correctly.";
+                Log.Error(error);
+            }
 
             if (features == null)
             {
@@ -64,6 +72,11 @@ public void Run(IContainer container)
                 Log.Error(ex, "Something went wrong during generation: {0}", ex);
                 throw;
             }
+
+            if (parsingReport.Any())
+            {
+                throw new ApplicationException("Some files were not parsed correctly.");
+            }
         }
 
         private static void ApplyTestResultsToFeatures(IContainer container, IConfiguration configuration, Tree features)
diff --git a/src/Pickles/VersionInfo.cs b/src/Pickles/VersionInfo.cs
index 5bfa03012..b66c252c4 100644
--- a/src/Pickles/VersionInfo.cs
+++ b/src/Pickles/VersionInfo.cs
@@ -8,8 +8,8 @@
 [assembly: AssemblyTrademarkAttribute("")]
 [assembly: AssemblyCultureAttribute("")]
 [assembly: ComVisibleAttribute(false)]
-[assembly: AssemblyVersionAttribute("2.14.0")]
-[assembly: AssemblyFileVersionAttribute("2.14.0")]
+[assembly: AssemblyVersionAttribute("2.15.0")]
+[assembly: AssemblyFileVersionAttribute("2.15.0")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const System.String AssemblyProduct = "Pickles";
@@ -18,7 +18,7 @@ internal static class AssemblyVersionInformation {
         internal const System.String AssemblyTrademark = "";
         internal const System.String AssemblyCulture = "";
         internal const System.Boolean ComVisible = false;
-        internal const System.String AssemblyVersion = "2.14.0";
-        internal const System.String AssemblyFileVersion = "2.14.0";
+        internal const System.String AssemblyVersion = "2.15.0";
+        internal const System.String AssemblyFileVersion = "2.15.0";
     }
 }