From c9029382dc2c8d9da45d71ffd4d7d173cfb071d1 Mon Sep 17 00:00:00 2001
From: Dirk Rombauts <dirkrombauts@users.noreply.github.com>
Date: Tue, 6 Jun 2017 19:44:40 +0200
Subject: [PATCH] Release 2.16.0 (#465)

* Move to NSubstitute and NFluent (#452)

* Remove-Package Moq

* Install-Package NSubstitute

* Use NSubstitute instead of Moq

* Remove-Package Shoudly

* Make GhostDoc happy

* Make SpecFlow happy

* Install-Package NFluent

* Use NFluent

* Fix spaces at the end of lines

* Fix indentation

* Introduce MarkTestAs class

* Better argument names

* Use language type keyword

* Update nuget (#454)

* Update-Package Autofac

* Update-Package Newtonsoft.Json

* Update-Package NLog*

* Update-Package System.IO.Abstractions

* Update-Package NUnit

* Update-Package ClosedXML

* Update nuget 201704 (#458)

* Update-Package NLog*

* Update-Package MahApps

* Move NDesk.Options dependency to command line runner (#459)

* Introduce Unit Test project for command line

* Move CommandLineArgumentParser

* Remove NDesk.Options from Pickles

* Add build scripts to solution

* Encoded files different from default cannot be parsed (#457)

* Parsed files are read with encoding deduced from reading first 4 bytes. Fallback is default encoding.

* Default to UTF8

* Extract file encoding logic to a separate class

* Add test cases for EncodingDetector

* Inline now-useless method

* Update Nuget Packages (#462)

* Update-Package NLog*

* Update-Package NUnit

* Update-Package System.IO.Abstraction

* Update-Package NSubstitute

* Update-Package Autofac

* Show inconclusive results (#463)

* Release 2.16.0 (#464)

* Version Bump (2.16.0)

* Correct heading

* Add change log for 2.16.0

* Version 2.16.0

* update chocolatey script
---
 CHANGELOG.md                                  |  17 ++-
 DeployToChocolatey.cmd                        |   2 +-
 build.bat                                     |   2 +-
 build.fsx                                     |   7 +
 chocolatey.fsx                                |   1 -
 chocolatey/picklesui.nuspec                   |   1 -
 docs/Output/Dhtml/Index.html                  |   4 +-
 docs/Output/Dhtml/pickledFeatures.js          |   4 +-
 docs/Output/Excel/features.xlsx               | Bin 38739 -> 38739 bytes
 .../Features/00BasicGherkin/BasicGherkin.html |   6 +-
 .../Html/Features/00BasicGherkin/index.html   |   6 +-
 .../TestRunnerIsNotImportant.html             |   6 +-
 .../Html/Features/01TestRunner/index.html     |   6 +-
 .../Html/Features/02TagsAndHooks/Hooks.html   |   6 +-
 .../Html/Features/02TagsAndHooks/TagDemo.html |   6 +-
 .../Html/Features/02TagsAndHooks/index.html   |   6 +-
 .../031ScenarioContext/ScenarioContext.html   |   6 +-
 .../Features/031ScenarioContext/index.html    |   6 +-
 .../FeatureContextFeatures.html               |   6 +-
 .../Features/032FeatureContext/index.html     |   6 +-
 .../03ScenarioOutline/ScenarioOutline.html    |   6 +-
 .../Features/03ScenarioOutline/index.html     |   6 +-
 .../04Background/BackgroundFeature.html       |   6 +-
 .../Html/Features/04Background/index.html     |   6 +-
 .../05TablesAndAssist/TableScenario.html      |   6 +-
 .../Features/05TablesAndAssist/index.html     |   6 +-
 .../Features/06CompareToAssist/CompareTo.html |   6 +-
 .../Features/06CompareToAssist/index.html     |   6 +-
 .../Html/Features/07Localization/Svenska.html |   6 +-
 .../Html/Features/07Localization/Vlaams.html  |   6 +-
 .../Html/Features/07Localization/index.html   |   6 +-
 .../AttributeOverloading.html                 |   6 +-
 .../08AttributeOverloading/index.html         |   6 +-
 .../CallingStepsFromSteps.html                |   6 +-
 .../09CallingStepsFromSteps/index.html        |   6 +-
 .../StepTransformation.html                   |   6 +-
 .../Features/10StepTransformation/index.html  |   6 +-
 .../11ContextInjection/ContextInjection.html  |   6 +-
 .../Features/11ContextInjection/index.html    |   6 +-
 .../ChildChildFolder/NestedFolderExample.html |   6 +-
 .../ChildFolder/ChildChildFolder/index.html   |   6 +-
 .../12NestedFolders/ChildFolder/index.html    |   6 +-
 .../Html/Features/12NestedFolders/index.html  |   6 +-
 .../MultilineFeatureExample.html              |   6 +-
 .../Html/Features/13MultilineText/index.html  |   6 +-
 .../14MarkdownExample/MarkdownExamples.html   |   6 +-
 .../Features/14MarkdownExample/index.html     |   6 +-
 .../15Pickles/InteractiveDHTMLView.html       |   6 +-
 .../Output/Html/Features/15Pickles/index.html |   6 +-
 docs/Output/Html/Features/Arithmetic.html     |   6 +-
 docs/Output/Html/Features/Trigonometry.html   |   6 +-
 .../Features/Workflow/ClearingScreen.html     |   6 +-
 docs/Output/Html/Features/Workflow/index.html |   6 +-
 docs/Output/Html/Features/index.html          |   6 +-
 docs/Output/Html/index.html                   |   6 +-
 docs/Output/Html/readme.html                  |   6 +-
 docs/Output/JSON/pickledFeatures.json         |   4 +-
 docs/Output/Word/Pickles.docx                 | Bin 14061 -> 14062 bytes
 docs/Output/Word/features.docx                | Bin 14046 -> 14046 bytes
 docs/index.html                               |   2 +-
 nuget.fsx                                     |   2 -
 src/Pickles/Pickles.BaseDhtmlFiles/Index.html |   4 +-
 .../Pickles.CommandLine.UnitTests.csproj      | 117 ++++++++++++++++
 ...es.CommandLine.UnitTests.v3.ncrunchproject |   5 +
 .../Properties/AssemblyInfo.cs                |   4 +
 .../WhenParsingCommandLineArguments.cs        |  15 +-
 .../packages.config                           |   7 +
 .../CommandLineArgumentParser.cs              |   6 +-
 src/Pickles/Pickles.CommandLine/NLog.xsd      | 128 +++++++++++++++---
 .../Pickles.CommandLine.csproj                |  11 +-
 .../Pickles.CommandLine.v3.ncrunchproject     |   6 +
 src/Pickles/Pickles.CommandLine/Program.cs    |   1 +
 .../Pickles.CommandLine/packages.config       |  10 +-
 ...entationBuilders.Cucumber.UnitTests.csproj |  16 +--
 .../packages.config                           |   8 +-
 ...kles.DocumentationBuilders.Cucumber.csproj |  10 +-
 .../packages.config                           |   6 +-
 ...cumentationBuilders.Dhtml.UnitTests.csproj |  12 +-
 .../packages.config                           |   6 +-
 ...Pickles.DocumentationBuilders.Dhtml.csproj |  10 +-
 .../packages.config                           |   6 +-
 ...cumentationBuilders.Excel.UnitTests.csproj |  12 +-
 .../packages.config                           |   6 +-
 ...Pickles.DocumentationBuilders.Excel.csproj |  14 +-
 .../packages.config                           |   8 +-
 ...ocumentationBuilders.Html.UnitTests.csproj |  16 +--
 .../packages.config                           |   8 +-
 .../Pickles.DocumentationBuilders.Html.csproj |  10 +-
 .../packages.config                           |   6 +-
 ...ocumentationBuilders.Json.UnitTests.csproj |  16 +--
 .../packages.config                           |   8 +-
 .../Pickles.DocumentationBuilders.Json.csproj |  14 +-
 .../packages.config                           |   8 +-
 ...ocumentationBuilders.Word.UnitTests.csproj |  16 +--
 .../packages.config                           |   8 +-
 .../Pickles.DocumentationBuilders.Word.csproj |  10 +-
 .../packages.config                           |   6 +-
 .../Pickles.MSBuild/Pickles.MSBuild.csproj    |   8 +-
 .../Pickles.MSBuild/Pickles.MSBuild.nuspec    |   1 -
 src/Pickles/Pickles.MSBuild/packages.config   |   4 +-
 .../Pickles.ObjectModel.csproj                |   4 +-
 .../Pickles.ObjectModel/packages.config       |   2 +-
 .../Pickles.PowerShell/Pickle_Features.cs     |  22 +--
 .../Pickles.PowerShell.csproj                 |   8 +-
 src/Pickles/Pickles.PowerShell/Pickles.nuspec |   1 -
 .../Pickles.PowerShell/packages.config        |   4 +-
 src/Pickles/Pickles.Test/BaseFixture.cs       |  15 +-
 .../Pickles.Test/EncodingDetectorTests.cs     | 123 +++++++++++++++++
 .../Formatters/HtmlContentFormatterTests.cs   |  10 +-
 .../HtmlScenarioOutlineFormatterTests.cs      |   7 +-
 src/Pickles/Pickles.Test/Pickles.Test.csproj  |  34 ++---
 src/Pickles/Pickles.Test/packages.config      |  14 +-
 .../Pickles.TestFrameworks.UnitTests.csproj   |  24 ++--
 .../WhenParsingMultipleTestResultsTests.cs    |  40 +++---
 .../packages.config                           |  10 +-
 .../Pickles.TestFrameworks.csproj             |   8 +-
 .../Pickles.TestFrameworks/packages.config    |   4 +-
 src/Pickles/Pickles.UserInterface/NLog.xsd    | 128 +++++++++++++++---
 .../Pickles.UserInterface.csproj              |  16 +--
 .../Pickles.UserInterface/packages.config     |  12 +-
 src/Pickles/Pickles.sln                       |  17 ++-
 src/Pickles/Pickles.sln.GhostDoc.xml          |   1 +
 .../Pickles/CommandLinArgumentHelpTexts.cs    |  39 ++++++
 src/Pickles/Pickles/EncodingDetector.cs       |  38 ++++++
 .../Pickles/FileSystemBasedFeatureParser.cs   |  35 +++--
 src/Pickles/Pickles/Pickles.csproj            |  24 ++--
 src/Pickles/Pickles/packages.config           |  10 +-
 src/Pickles/VersionInfo.cs                    |   8 +-
 test-harness/AutomationLayer/AdditionSteps.cs |  12 +-
 .../AutomationLayer/AutomationLayer.csproj    |   5 +-
 test-harness/AutomationLayer/MarkTestAs.cs    |  23 ++++
 .../MinimalFeatures/MinimalSteps.cs           |  10 +-
 .../AutomationLayer/ScenarioOutlineSteps.cs   |  70 +++++-----
 test-harness/AutomationLayer/packages.config  |   2 +-
 test-harness/SpecRun/App.config               |   8 ++
 test-harness/TestHarness.sln.GhostDoc.xml     |   1 +
 test.fsx                                      |  11 ++
 137 files changed, 1163 insertions(+), 532 deletions(-)
 create mode 100644 src/Pickles/Pickles.CommandLine.UnitTests/Pickles.CommandLine.UnitTests.csproj
 create mode 100644 src/Pickles/Pickles.CommandLine.UnitTests/Pickles.CommandLine.UnitTests.v3.ncrunchproject
 create mode 100644 src/Pickles/Pickles.CommandLine.UnitTests/Properties/AssemblyInfo.cs
 rename src/Pickles/{Pickles.Test => Pickles.CommandLine.UnitTests}/WhenParsingCommandLineArguments.cs (98%)
 create mode 100644 src/Pickles/Pickles.CommandLine.UnitTests/packages.config
 rename src/Pickles/{Pickles => Pickles.CommandLine}/CommandLineArgumentParser.cs (99%)
 create mode 100644 src/Pickles/Pickles.CommandLine/Pickles.CommandLine.v3.ncrunchproject
 create mode 100644 src/Pickles/Pickles.Test/EncodingDetectorTests.cs
 create mode 100644 src/Pickles/Pickles/CommandLinArgumentHelpTexts.cs
 create mode 100644 src/Pickles/Pickles/EncodingDetector.cs
 create mode 100644 test-harness/AutomationLayer/MarkTestAs.cs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dde8e23f..020ee33d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,9 +14,24 @@ 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.16.0] - 2017-06-06
+
+### Added
+
+- Add handling to guess some encodings ([457](https://github.com/picklesdoc/pickles/pull/457)) (by [@s991116](https://github.com/s991116) and [@dirkrombauts](https://github.com/dirkrombauts))
+
+### Fixed
+
+- Show inconclusive results in DHTML output ([463](https://github.com/picklesdoc/pickles/pull/463)) (by [@dirkrombauts](https://github.com/dirkrombauts))
+
+### Changed
+
+- Under the hood: Move NDesk.Options dependency to command line runner ([459](https://github.com/picklesdoc/pickles/pull/459)) (by [@dirkrombauts](https://github.com/dirkrombauts))
+- Under the hood: update several third party packages ([462](https://github.com/picklesdoc/pickles/pull/462)) (by [@dirkrombauts](https://github.com/dirkrombauts))
+
 ## [2.15.0] - 2017-03-09
 
-## Added
+### 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))
 
diff --git a/DeployToChocolatey.cmd b/DeployToChocolatey.cmd
index da005298a..8109e932a 100644
--- a/DeployToChocolatey.cmd
+++ b/DeployToChocolatey.cmd
@@ -1,7 +1,7 @@
 @ECHO OFF
 
 REM this script supposes you set the chocolatey API key by running this command:
-REM   choco apikey -s"https://chocolatey.org/" -k="<your key here>"
+REM   choco apikey -s"https://push.chocolatey.org/" -k="<your key here>"
 REM Mind the trailing slash!
 
 .\packages\chocolatey\tools\chocolateyInstall\choco push .\deploy\chocolatey\pickles.%1.nupkg
diff --git a/build.bat b/build.bat
index 905f46acc..941c34c87 100644
--- a/build.bat
+++ b/build.bat
@@ -1,5 +1,5 @@
 @echo off
-set "picklesVersion=2.15.0"
+set "picklesVersion=2.16.0"
 
 cls
 
diff --git a/build.fsx b/build.fsx
index 7372cdfc4..1910e1dac 100644
--- a/build.fsx
+++ b/build.fsx
@@ -105,6 +105,12 @@ Target "BuildTest.DocumentationBuilders.Word" (fun _ ->
       |> Log "AppBuild-Output: "
 )
 
+Target "BuildTest.Runners.CommandLine" (fun _ ->
+    !! "src/Pickles/Pickles.CommandLine.UnitTests/Pickles.CommandLine.UnitTests.csproj"
+      |> MSBuildRelease testDir "Build"
+      |> Log "AppBuild-Output: "
+)
+
 let createZip (packageType : string) =
     !! (buildDir + "/" + packageType + "/*.*") -- "*.zip"
         |> Zip (buildDir + packageType) (deployDir + "Pickles-" + packageType + "-" + version + ".zip")
@@ -136,6 +142,7 @@ Target "Default" (fun _ ->
   ==> "BuildTest.DocumentationBuilders.Html"
   ==> "BuildTest.DocumentationBuilders.Json"
   ==> "BuildTest.DocumentationBuilders.Word"
+  ==> "BuildTest.Runners.CommandLine"
   ==> "Zip"
   ==> "Default"
 
diff --git a/chocolatey.fsx b/chocolatey.fsx
index 44ddcfc60..a5be9923d 100644
--- a/chocolatey.fsx
+++ b/chocolatey.fsx
@@ -66,7 +66,6 @@ Target "CreatePackage GUI" (fun _ ->
         guiDir + "MahApps.Metro.dll";
         guiDir + "MarkdownDeep.dll";
         guiDir + "Microsoft.Practices.ServiceLocation.dll";
-        guiDir + "NDesk.Options.dll";
         guiDir + "Newtonsoft.Json.dll";
         guiDir + "NLog.dll";
         guiDir + "NlogViewer.dll";
diff --git a/chocolatey/picklesui.nuspec b/chocolatey/picklesui.nuspec
index 0e20f38b0..00e75d262 100644
--- a/chocolatey/picklesui.nuspec
+++ b/chocolatey/picklesui.nuspec
@@ -46,7 +46,6 @@ Optionally, *Pickles* can **integrate test results**, so that your stakeholders
         <file src="MahApps.Metro.dll" target="tools" />
         <file src="MarkdownDeep.dll" target="tools" />
         <file src="Microsoft.Practices.ServiceLocation.dll" target="tools" />
-        <file src="NDesk.Options.dll" target="tools" />
         <file src="Newtonsoft.Json.dll" target="tools" />
         <file src="NLog.dll" target="tools" />
         <file src="NlogViewer.dll" target="tools" />
diff --git a/docs/Output/Dhtml/Index.html b/docs/Output/Dhtml/Index.html
index be4fc7695..52d0d283b 100644
--- a/docs/Output/Dhtml/Index.html
+++ b/docs/Output/Dhtml/Index.html
@@ -49,9 +49,9 @@
             <div data-bind="if: WasSuccessful"><span class="badge badge-success"><i class="icon-ok passed" title="Passed"></i></span></div>
             <div data-bind="if: !WasSuccessful"><span class="badge badge-important"><i class="icon-minus-sign failed" title="Failed"></i></span></div>
         </div>
-        <!--<div style="float: right" data-bind="if: !WasExecuted">
+        <div style="float: right" data-bind="if: !WasExecuted">
             <span class="badge badge-warning"><i class="icon-warning-sign inconclusive" title="Inconclusive"></i></span>
-        </div>-->
+        </div>
     </script>
 
     <script type="text/html" id="steps-template">
diff --git a/docs/Output/Dhtml/pickledFeatures.js b/docs/Output/Dhtml/pickledFeatures.js
index 6053dffc2..52cc590da 100644
--- a/docs/Output/Dhtml/pickledFeatures.js
+++ b/docs/Output/Dhtml/pickledFeatures.js
@@ -3089,7 +3089,7 @@ jsonPWrapper ({
   },
   "Configuration": {
     "SutName": "Pickles",
-    "SutVersion": "2.15.0",
-    "GeneratedOn": "9 März 2017 16:27:59"
+    "SutVersion": "2.16.0",
+    "GeneratedOn": "6 Juni 2017 18:27:17"
   }
 });
\ No newline at end of file
diff --git a/docs/Output/Excel/features.xlsx b/docs/Output/Excel/features.xlsx
index 5ef1e3ccf49bc6dc38f03c7cf2f71dc627775179..cff81d32a79b989dc6778f849f3e459691ed177a 100644
GIT binary patch
delta 1048
zcmcb-j_L9`Cf)#VW)=|!1_lm>%*n?#@`^BX0BNt%f6s1g)?_wk6i7`oNJ~viH8eF$
zH8U|tHQ8LiV#XMsn3`s2l$4s3XlRjUl9-fik!opVVxDT5l9*_2Zep6OS5Tarl3bvq
z;F)5p6l88}VrprTmX>B@W@2JsZmguBZ)c+)l$w)Rl9``ZoRL{jY=`2G&8%!!n3;hN
z*?fodnGl$9RAx6Ln9(d(3X%G)$j=TI;nn=g#0PRU&lGbXdnN{kS*(*6>Pc?a)X8E3
zE10Gy0nxJ2@FFu<<+{{c>i3u#7>)>oRjxGUWC4rIhNmx#0*dqTfy5^pw6JczXW0PJ
zoM@{IVYEBkgxHs{i)%|MD+5E6GT4-M=LM`_`?Nf#L5ws0q#O_obdWL|Siy7OI*5ZZ
z0%kGsf?O<rt87mlP(knHi4Ibe-?y`F)(c(&ky^F%id8RA>MKZU^Uu&75Ib4U{V}rx
z3NK`x9GERNX$sJR5h)NU{Y<NipMg?yxIt2zv!dl7?(L4-22pTmhxx(^paL#-kb=nz
zx>z^oCC-C5i9f{}qS`n88-(GOeH_9N$Twl;1iALcm+9X!Cr^x%-<(r41)`0)^b0FE
z#aw-PkAL$2Dl>H=lg4C5E}6;mYqd5ns+M6CHPbaP3o$gaGBUR^w9vCOH?XuYGMs$5
z#ubN*Zmm8zq~mLE3V;}st^2It33qaBpCMRqW1lsce&1&grVaaD!E|N61(@E_?*yiQ
z_B(@V`w0-b6-u9m(t;Bq;^9zwE|h)@r8Or(<ny8QRw(@&N;^)5$hSl3vy)xG_K8e^
z(9uwO5tM!jr46P+<jbM-zNs!q@sK!0bh5%UO|VHm(`*s3FmalT8IiFN;LXUS%fJQ9
N{|un~Kbd>F2LRBNkWByp

delta 1048
zcmcb-j_L9`Cf)#VW)=|!1_lm>hUUzTydumTK-w#{Bk=ZSO=fdO0Sk*1lSFe1(?p|G
zGn2$b!_5UOW{mO4NtVf`CdsKuhG`ZimWGyzmIi4l1_r6-DVAv#Nk*o61;x23$puOZ
zo+-9UL5YdU$p%TLi6*JWMkZ-SDM||Zb~gG!sX2)ynfZCe8JPveb|~)H%*u9!nHlJi
z&38DT34s|$Wp*=y8O?H~5UJma{On*6Ud^ved>~izOfmPdXJTNO#X5PRp5$gtoh&A>
zf@yjZ5G@-GFEWEwu1me8evg@f;fOF;<w{dd7O=Q%c>2O9pg12NNPMzE3+v{4mJJZi
ziMGlRM!UmJh<zEmxVDtCGB89bgH367Ucd^rPs?)}#5m(m$^pSZ2Pw0G6+HK?gE%N7
zU=|ZE$i?!v%J$R&74%M?=pZ%ueLL%Bz2GGfsZ~p_SoH#>zJjDS{|wy$v6JQ8A2U0k
z@Iuzff!R`%rT`rnkphv@&$PPu87MV}8zi+kD_RcX-tM?<5Cw;Jm@ljVD&S%VDVV&V
zi*<8e;yj3x_*1MQs(sVHK^Sh?#~}=Xd=q9)kZW&znf@(v^29j#%{fI=AljHqzp#Q+
z%r@hfPbUAbGE*lqX-sD1l9@ceR%`R3Y8ggRV_gHw5JOWdBMU17Lp?(yb4v?z%gL8(
zTye<g*6M>pI==R%0EjW!y3Y!pa3|OH8G;2j_F04J_kH$Y+OXdhOjq_>faxv$PGI_H
zzcZM&p8%m-q4a4eEjSS(9uB4FLg~j)T5}RaJ|9YNh0?#FwBuxmd^?mrJJ|(npU4yl
z9Sx-yLFt!J+F&X~z8p&Lo9coT4~bJmCo4?T1e@eD%@z?06Q{YD5g7{s-i%DT3|zqc
N&j8B*lewpR006o$cNPEu

diff --git a/docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html b/docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html
index 4a4c7ce59..f458e8fdf 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:57</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 717c67ea9..4bc366a4c 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:57</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 781bd3a66..7887702e5 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:57</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 bf998ceb6..301087085 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:57</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 3848b4081..54653edd0 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:57</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 ee8b78c3f..3f8ce7edc 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:57</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 56864b278..ebd48b931 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:57</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 641127c3c..312724a62 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:57</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 8a5c574b7..3a1778a26 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:57</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 eb04389bf..7ec24121a 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 9c9d15652..96475ec4c 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 057180274..734c4c87f 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:57</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 460667876..5b0f6ab48 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:57</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 81a56b867..63e31c45e 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 448c62759..ad10c3d7a 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 68e261b9c..42da17662 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 7d844ccb5..8f9b887fb 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 954ff2cf8..e48e644d6 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 cae0ed902..f3770e46d 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 af0957c63..210e1a5b5 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 630147577..625af04b3 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 c215934ab..1776085fd 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 279de93af..54bed0aea 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 0699eb304..b6489f84e 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 509a0c2a3..16d5fb3c7 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 6725858af..6d99854ee 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 5927c5668..320b2bd51 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 dd79fb9fe..e05bdcb70 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 4e0192b0b..bf0d86b00 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 6546d9ef5..6b7b27117 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 37e0ee99a..2efbbc2db 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 7a358c636..27cdec305 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 5cd38481a..aef769707 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 a51e74b2b..ed6e94106 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 768ac350f..128c30145 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 a69d2a4b8..369402459 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 1e20981eb..3177f49d2 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 0a7ccd4fb..d481d7f28 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 6f425dac2..72a410cd8 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 002e048fc..e46e669c2 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/Arithmetic.html b/docs/Output/Html/Features/Arithmetic.html
index 21aacbc00..9a55515db 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/Trigonometry.html b/docs/Output/Html/Features/Trigonometry.html
index 9988f5238..458095908 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 fb4dd9671..ed80d28f4 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.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 8b408b74c..d55234475 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/Features/index.html b/docs/Output/Html/Features/index.html
index 557a51dca..0e0e8f372 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:57</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/index.html b/docs/Output/Html/index.html
index 9b133a115..3f93bb518 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:57</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/Html/readme.html b/docs/Output/Html/readme.html
index c98a548bb..301c1ab6b 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.15.0</p>
-        <p>Generated on: 9 März 2017 16:27:58</p>
-        <p>Produced by Pickles, version 2.15.0.0</p>
+        <p>Test results generated for: Pickles, version 2.16.0</p>
+        <p>Generated on: 6 Juni 2017 18:27:16</p>
+        <p>Produced by Pickles, version 2.16.0.0</p>
       </div>
     </div>
   </body>
diff --git a/docs/Output/JSON/pickledFeatures.json b/docs/Output/JSON/pickledFeatures.json
index 670a4e6f2..72e3a5c75 100644
--- a/docs/Output/JSON/pickledFeatures.json
+++ b/docs/Output/JSON/pickledFeatures.json
@@ -3089,7 +3089,7 @@
   },
   "Configuration": {
     "SutName": "Pickles",
-    "SutVersion": "2.15.0",
-    "GeneratedOn": "9 März 2017 16:28:01"
+    "SutVersion": "2.16.0",
+    "GeneratedOn": "6 Juni 2017 18:27:19"
   }
 }
\ No newline at end of file
diff --git a/docs/Output/Word/Pickles.docx b/docs/Output/Word/Pickles.docx
index 824434662cd646265fd624480464ccd1ffddb56e..ee936c64ab4afda015f553924fe8bd69c3175295 100644
GIT binary patch
delta 1416
zcmaEx`!1I^z?+#xgn@y9gCTSBv5manq&R@I*Qv&;(9PV^mW+mJrl|&&mPTggX^EyL
zrYROm3i@_7`a!8Vi6xo&dBqu-1;utKW^68%xx~W>GQ^Hs;*;0p08N+r%iej-1_Epk
zRx7;k=9OR$^)P$8=(a}C^<#3(S_vusx1Qz1e(~7rv{ESaNucJcDNBz(j-P+*+x6qm
zlfK?7Kd5bS|JFj4z!M$}&6{?~zM7PC@y^qftubpBPPQohu}rqsKvuHGQ|idac|q%?
zUM%H*%W-&1@|xGGe%|4i16PShGWXU?3ST*Ee4;RI!_D3T-$ka&LO&#2-PX>i&l23f
zo6m;R?9$Z+)rI-jUOJo3x#aO-iT5TymdQMm=BQ8jY|-!OuwL=&+M;XG%?mgEb^N^e
zgr3&C=p4CT#@70VG+yJ`E0lyYCq9ilw{uFt(zo%Cjmi%6uCcOU{g-zpLBS|Cq;hK3
zvWT4mkER*$cU)Gsk-xLhE;&;<sDo?T2A!v?CT&kKRWRKVd}W`NvZzg8B#)-HL*X=$
z?R%ZNpD(E`bz2oN&EVu}k7b(YZ_IP)ulx2%8a1q6YHej=28Q+Kg}SbcAjagEdRM_Q
z=vd|_JNcNtW&K&d76Xyi_|_6#5j88rlms)K7{4!^S(?tqe^2K!KEE0B!((65)8#7+
z4UZh*<=y+d=J~gvd-3=Aj*Dw9n%DR=N>sx;NW{>!^z7B04s){~RhQ`SJKwt|P`Pqb
z<$10vR_R4Oy16q|%r3TR#^;!LJo=+OXQN8NOCO)DCPzM|>+PuD{U~<UyNgX1<@mMY
z1vWkr*>bg4T6brjl;6!wEbKWa=ju*fHaF#zZ>PkJ54IVp(Rn!wPVT={vypegzwORn
zf>`b*Y+G{Gfz7^L^VtGN=Uj*2w6*uwK6~VK<`OTnjNs~IZ|?iX&gzp2wkBOU|9*d(
zx?Q#8t(IRl9rKS?^!k`Q`4_kDYCo&j<=uaC!`=qmSQX)H^>AN^+HuZhPfy0Oe!euX
zgUQw)$k;(pkH2E74}bVPi@h9a`G?l_m3eOSzZCdF&GO8$|GDXY2QK#q*D;_3zE^^#
zjN0UAL)ZERPJxs2lx~C-FirO92;FZ|CRAl6Cex|?z=lzAVMniS^|Sx~K33S>yVt)w
zT-B5PMaxA=UnMur7neeu_NQ$5`t@DkyidvVugQ6OT-AH4u(<cTS#NT<*@7M2J*=`#
zTOE(qT0HVzV-Xj%Tf2ADo$hqS*8Rt-kMWfpo6+Dt_gu%^dLdP*^elUipy2C^S}LPO
zb{s9AB(f|=G{fHN7>Ci7ge}=ErQE)Mr;9b6WqSFq%4PYJN!M@d=81l?`x1Nd<O=hM
zNE1~H@w{%$9YVs}7B(^`h305JT>d<$^O4hfiNC-9hridTIPWVR7|+kSSK`=-Np`%O
z!)(*0Y`lHgH|WjFqEJ7Fv(Yd2ySg2fJpT4%ylTspzSBMTq#rYCc79IYv#h84yu1T*
z5x?lm*8CHZQ^Yy@-YkA1u(5-e$^KM<P=B_>`#-`c;kx;aQ5hsHr<&NnOQXpvO$@;a
z{H}==Qt6^#>L?E?Yi{2z*ptG<z`)PTz#s)I&Jf`4<OWksu+BB6(#%tJ876Pk6`p+8
zlm{&K##EZ|?qm)#1w^JXFcV|kI@#S!E(T;UD3W~{fd(@JF~U?J%gc~~p*+7RML#V+
uza+ItuOc@mz?+dtmjPa!daZmn`GXcvb1(}7gD{Hb2a^w)sj-EdfCK@NZ&m;R

delta 1392
zcmaEt`!<(1z?+#xgn@y9gQ1~0b0hCJDGng*mGxI!VKcY1C8J@orHN%)qJcqLVzQx$
znURT-g1()Neo$&oVo7FxUU5cdL9rc*8JkOGF7a@J49T!|d*eAdK+~muvajD^1A*4{
zLY4k9)_FmTm)$+klpET)wf>l=i;(*^?k_ny7DC|)D+ImjCul9vd4BfH<>i&%t{;D%
z_4%IJMQw}t+v^-u`~q0!Zrb(k6w}-0ozaWVR&8x{Ye_s5UiyA<;?mEotDIiEH~hA$
zDeT9MZx?uFlVi0H1?&>~?zFc<$e`YL63_0H>{efU%G%}f3b!1)!X>xn*7ggn+Q)9R
zJ2T6<T0ivSU_F$7?PXvuySa$%OQu}LB_UDIymO1xGP;y%xPzj#)AyPxhHaD0tkd|k
zTI77`3b|fJ(SHoHczkZ`P*b}s!x0~JEVD@Y_WpCJIpSqbW(9mdZqI0Vs^l$x;PR1h
zk3$WgEDzeW7}y*-eYp3RiMOK%S5u}MuX4|s&d|mS56&&@d&S}zWVU2_y3%P=?;lC`
zIC6KmSgpGJLFB2X_g5#6vo9p%?0(*SosSySue7!@F$05o^CDeWMi682E4{1W2;9!a
zc6jn}eam{^yk=0yH|@#W&^c>`Q)5m<iR4!Gf?m$BKg%~ZKFf*y;<4B1Y<_g;s(>YV
z8$Rs$zV~B--MxGK$HP?@Piq!-OV{Y+?AnpGOyt*`g~!5YvzMIVkByoxz`C+5^R#hD
zb$)P<?CPD1^vtHc4p_sZ@#?VloQ;bLGT*dGrmhs%cjBtAKN{`yE#uIP2KKpr9lb(4
zJ;qbt>#kg>b@0cQGkg(~t)sXOOC8-RFJxFCS!HnR>Y-gTm*p*OO|o^qwV&^zmgQ@!
z-D+!DZnf^zwqz@1^WttRe10g;P)t0@DU4@>yH1~}?w>PrtOG+{ur98z|F3Gzck}WE
zwky{i59$2MPFbwS8&|%z=9GZq?!UD`IT!bYe&{m0RKJ?1PnhTQ=KWrBOLV77Rz2DB
zq(Nzp{0AjTIXipKvWa)@p51PB>)1&>wY?YkizIyi-##~^p<Q16KMP9WdkG7em`;u{
zbgj>5U8Hu`Wy9JBENU}N!v0RO^?Y$NqCjO`!)KP37A>=FZ)X1gef;syifVhA_^B$g
z7WzHsGK37h9HuW5`ZedG*z2>lw$Iw_)?S=AVO8xdM>lDg*~d2OO9$L>Ki0%|@Rr3<
zLz%mlVRvGqc5C)-k~!Kvfoc86X&Y_l8mc{*>z97St-kY;WPX;6%F315frs|!a+P<#
zSJCvjsdd4^>KI?jih~*VIbMs;`lYYSGMn|%->)5hCso&P-@YTX@B6~{UVd(S3#XPY
zV|jl#*N`<l=}=zAgN6vv?NdHnE?((UxG=ou-{1eM%SHA)U)H-~eS1qBPjZUq{I<x|
z^Ndd2$g7_&61^+NPc-0j*rV+yR#@yTtUk87Wx}n(nHSlU1!PnU>pHGaDLnW`(8QuI
zU}9W?v)`gU9v@PqRd;u|<_J8{D4tvqbGYL9e3WqA{MM)pl9tm<Y~Y2_<W(ky-~@ip
z#0sf!Q8aaw2NgB9Zx`%IVPat5=Vf4!0+wb7aA$I(sU}$GT2pDpDU(l{DuQ`$fxJ7D
zIn5Lh*~QRIjB(3k4>LKi5IB1C%*5<G4H+29^NUjS)AI96Qj7E|a&rQ_8JTn$;Kiob
g%6F4LXfZM{1hX(O2qWwUvhGhlWTwUzW&#of094FRaR2}S

diff --git a/docs/Output/Word/features.docx b/docs/Output/Word/features.docx
index 81f32a20a69b03bdb9f0ef929edb636079c0183e..7c60fe1272ce1d39519b620c5134a29942362a4b 100644
GIT binary patch
delta 914
zcmcbYdoPzaz?+#xgn@y9gCTA5v5manq&R@Im&xKyKAX9vtr!iAl9H2>5{-a3&BQd-
zKuJO0&PG2dH7BtoGe565BeS5`4#kMgr81Xzz-I87UJRe?uNhcx-8q-#$`<K}4QsVF
zmc5y&rqro?o3+YJOr}#iA*1yYdr<3@rN_Um_c#9b{P*#kkJrjCaz|XBwNT0Pj0a1z
z(Jt9*qBkq{Xr4^6i*{14wRkwItR!%U(T*;Yd;R58tgbrf$L6?69O9F@?JYm8%-4P8
zyr)tbry~5`nl#I#xvhT7Q9oTp>PXnZy@9jk*y`10SnYp%U}A>qTd5k?7ppf`#rHZ(
zb;^~xPMh%AXLCq_YVf>gs+})Xm+T9@X3=aHw(NfPKGCC*M}uF_W_Jnr$A96;fg{Hj
ztZ@x|zRSZxpCu;aclhoLJawwC`T837OAF7?3XM&R4B}W;p%5qh?7;629RAYY+t>R?
zXr7*IGMQD}^~Llj*HcUtOm8G#S!X4y_*f~hL+YmP^iQXhP5w>Uvf9sM(n5`yVjZQ&
zLYwSWsy=Lf9*-KjFSWKZF#}_0^Fm!$Mi682OTDXLfrI+ZjNouj(3DY|>|^L!zrZPQ
za-PzSumYyZJ{_U^P0EBIf&RdTQE_2MuWt3T|NlN#*xkF=zdT&kll?`@MM+;JH_jKA
zLY(%eZ29{2UEjP<$@8ztd3s#cd#kXx_q$nda=6)o9o;>wvQ1kZkJef|@?K*R7qwfv
zchjBjbj8;F$EuI<l^mPV;6C?U$J}}$RjKqWdyk;t>x)_{qeXTcEuSQ^EJrlM-s%{K
z(UpWP*)65qzJI5SHJxR8`LD`l`IAZ4Z|mlXezN-#d-CK8^N2_jRSWUFZp|G+!rK-$
zGAD)RXg*y2JgD=L(|U=&zyF87*Qhw}D;*fm&$(CP*ojGYyqm*p)23{^eb_hX&C8-t
zKZmo?FZa8;9hE%(_GG+j%ay*<J@=#^Gir8zPTsSur~ACT19K6-=*!mp6OmKIIs4u$
zej>23gO|zvRDn=`w#55C!l*%i*Qg8<;$bE>@Jup!mWd%a8qS$mAyU17sS{W*)YKJB
c&o#9L(|1j6z_g4RL@_w3;>=9Jg44`A0IE=sZ~y=R

delta 914
zcmcbYdoPzaz?+#xgn@y9gQ2=Pb0hCJDGng*wQfUC>1J+eD@FqYb4#<t#Kg2@gH#j4
zBts<yeLEZdpwyhilFa<P;*89KVmlNgHkZm=;sKlS>`t%fWPi=T`sWX~7-rq#)wvNi
zHKPA*q0q!56W=n~N^|!e5jEK2l*t{`dS&VHZ|nVyza78*JL&7K@{7h%*JmwM%A7NS
zgFQ3E`ikhys@mX5SBo|t<EycFIIFBAaEH;3E|Yux+oxFFOyJiuQ|3!_m%iQ1?;U+v
z@QLshkIgDG1Fg?09G`hH&HPclYNy-lut#$z-j-wk?`=?8cYUGqMYf#YeM(=BMwG5N
zrr7Jkze?%#9BxJ*gO(t}gQlG?RF~|Vdd*^St&VT~g&NIg`?chv@88Mpz4V`PmduPB
zOHM8HXzbPzs63>%<?rg)TRe5liw*}rIDd>~nd65hZBEN+JOMGn&o2D_z;Rx>e1*6C
z*X(1W=PvK@nfO#|zuIcYfDHe@->+IiR`k5qIin}2`FQEBcO1R;>Tg#I3mMH(H@+}w
zs$}z~A8HpD&)@rp1vPYEYHej=2FB3lg}SbcAjagEdRM^$2lbm7!Qn0}U}8Gi$I!Jt
zqjizmU6&1OAF!y+Gzt4V$=375&4>b(bq$|cT3WQsw!NA8|M&67KP#&3W#Xr*$Xe+4
zoXZe0^m3TKOz78~i(;?O+S)#Aw_AI0;)GSTw;bK1U1lHKs4pFG$Ng9n-@#iJM-64}
zT87<;joPi*yGiC~_XMW(AE#}!oolG}V6I>K5x4rzOOp9nGAb)qW(OYHqsvv^{a!`W
z=cd*L3#(&%DJu?U+~;^LKI@mhF3W7zOMkz1_?=W;zkU0T(7x{r-+TGF?Jb;Ix{T%h
z;ao%3@T5a|84nsFM7K}*aJhJ;OX0%so_~M;uPzta^L$zFiuLU+aXiT>p7YxxSI;v#
zbtA8Sx=8e{7(dZ~&tZ?YpIBkBv#|Qu>Xr$&3TIwqPZp3-Ev)OfKBe&BA3+m~zJQ5w
z3C@0t_IP|qkyhQ^;hH1xK%;naMa<!f=krm6{;p9OB*eo^Y~Yz>@+=cWa5S7Vu|lMJ
m0aGWiV5q4pn4W8D3#RXy+JI>pGl*hvRK=N@f(56Uc>n-Od6&EZ

diff --git a/docs/index.html b/docs/index.html
index 78a3679f9..3061e9de7 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.15.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.16.0">Github release page</a>.
                 </p>
 
                 <!-- <h2 id="we_need_your_help">We need your help!</h2>
diff --git a/nuget.fsx b/nuget.fsx
index aacc02894..91928549b 100644
--- a/nuget.fsx
+++ b/nuget.fsx
@@ -62,7 +62,6 @@ Target "CreatePackageMsBuild" (fun _ ->
         msBuildDir + "DocumentFormat.OpenXml.dll";
         msBuildDir + "Gherkin.dll";
         msBuildDir + "MarkdownDeep.dll";
-        msBuildDir + "NDesk.Options.dll";
         msBuildDir + "Newtonsoft.Json.dll";
         msBuildDir + "NLog.dll";
         msBuildDir + "PicklesDoc.Pickles.Library.dll";
@@ -98,7 +97,6 @@ Target "CreatePackagePowerShell" (fun _ ->
         powerShellDir + "DocumentFormat.OpenXml.dll";
         powerShellDir + "Gherkin.dll";
         powerShellDir + "MarkdownDeep.dll";
-        powerShellDir + "NDesk.Options.dll";
         powerShellDir + "Newtonsoft.Json.dll";
         powerShellDir + "NLog.dll";
         powerShellDir + "PicklesDoc.Pickles.Library.dll";
diff --git a/src/Pickles/Pickles.BaseDhtmlFiles/Index.html b/src/Pickles/Pickles.BaseDhtmlFiles/Index.html
index 64256972e..79efcc847 100644
--- a/src/Pickles/Pickles.BaseDhtmlFiles/Index.html
+++ b/src/Pickles/Pickles.BaseDhtmlFiles/Index.html
@@ -43,9 +43,9 @@
             <div data-bind="if: WasSuccessful"><span class="badge badge-success"><i class="icon-ok passed" title="Passed"></i></span></div>
             <div data-bind="if: !WasSuccessful"><span class="badge badge-important"><i class="icon-minus-sign failed" title="Failed"></i></span></div>
         </div>
-        <!--<div style="float: right" data-bind="if: !WasExecuted">
+        <div style="float: right" data-bind="if: !WasExecuted">
             <span class="badge badge-warning"><i class="icon-warning-sign inconclusive" title="Inconclusive"></i></span>
-        </div>-->
+        </div>
     </script>
 
     <script type="text/html" id="steps-template">
diff --git a/src/Pickles/Pickles.CommandLine.UnitTests/Pickles.CommandLine.UnitTests.csproj b/src/Pickles/Pickles.CommandLine.UnitTests/Pickles.CommandLine.UnitTests.csproj
new file mode 100644
index 000000000..957b268cc
--- /dev/null
+++ b/src/Pickles/Pickles.CommandLine.UnitTests/Pickles.CommandLine.UnitTests.csproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{C708FB0D-E2E0-4BE4-BB64-4373E4A0C8AA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PicklesDoc.Pickles.CommandLine.UnitTests</RootNamespace>
+    <AssemblyName>PicklesDoc.Pickles.CommandLine.UnitTests</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="NFluent">
+      <HintPath>..\packages\NFluent.1.3.1.0\lib\net40\NFluent.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.7.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.7.0\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\lib\net40\System.IO.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.Abstractions.TestingHelpers">
+      <HintPath>..\packages\System.IO.Abstractions.TestingHelpers.2.0.0.143\lib\net40\System.IO.Abstractions.TestingHelpers.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <Choose>
+    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+      </ItemGroup>
+    </When>
+    <Otherwise />
+  </Choose>
+  <ItemGroup>
+    <Compile Include="..\VersionInfo.cs">
+      <Link>VersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="WhenParsingCommandLineArguments.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Pickles.CommandLine\Pickles.CommandLine.csproj">
+      <Project>{A4EBBB5F-A18D-46D2-9ADE-2B90BD48CEC8}</Project>
+      <Name>Pickles.CommandLine</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Pickles.ObjectModel\Pickles.ObjectModel.csproj">
+      <Project>{55382afc-e050-4df7-aa4f-0aba71e2e169}</Project>
+      <Name>Pickles.ObjectModel</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Pickles.Test\Pickles.Test.csproj">
+      <Project>{8BD9FCD2-7ED5-46B5-B6A4-7FA3775E159F}</Project>
+      <Name>Pickles.Test</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Pickles\Pickles.csproj">
+      <Project>{38BAD6E0-78AB-4AC3-91A8-BF72AF5EE394}</Project>
+      <Name>Pickles</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.CommandLine.UnitTests/Pickles.CommandLine.UnitTests.v3.ncrunchproject b/src/Pickles/Pickles.CommandLine.UnitTests/Pickles.CommandLine.UnitTests.v3.ncrunchproject
new file mode 100644
index 000000000..6800b4a3f
--- /dev/null
+++ b/src/Pickles/Pickles.CommandLine.UnitTests/Pickles.CommandLine.UnitTests.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.CommandLine.UnitTests/Properties/AssemblyInfo.cs b/src/Pickles/Pickles.CommandLine.UnitTests/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..757007e2b
--- /dev/null
+++ b/src/Pickles/Pickles.CommandLine.UnitTests/Properties/AssemblyInfo.cs
@@ -0,0 +1,4 @@
+using System.Reflection;
+
+[assembly: AssemblyTitle("Pickles.CommandLine.Test")]
+[assembly: AssemblyDescription("Unit and integration tests for the command line runner of Pickles")]
\ No newline at end of file
diff --git a/src/Pickles/Pickles.Test/WhenParsingCommandLineArguments.cs b/src/Pickles/Pickles.CommandLine.UnitTests/WhenParsingCommandLineArguments.cs
similarity index 98%
rename from src/Pickles/Pickles.Test/WhenParsingCommandLineArguments.cs
rename to src/Pickles/Pickles.CommandLine.UnitTests/WhenParsingCommandLineArguments.cs
index 78a4210c7..4c1855f37 100644
--- a/src/Pickles/Pickles.Test/WhenParsingCommandLineArguments.cs
+++ b/src/Pickles/Pickles.CommandLine.UnitTests/WhenParsingCommandLineArguments.cs
@@ -24,11 +24,11 @@
 using NFluent;
 using NUnit.Framework;
 using PicklesDoc.Pickles.Extensions;
-
+using PicklesDoc.Pickles.Test;
 using StringWriter = System.IO.StringWriter;
 using TextWriter = System.IO.TextWriter;
 
-namespace PicklesDoc.Pickles.Test
+namespace PicklesDoc.Pickles.CommandLine.UnitTests
 {
     [TestFixture]
     public class WhenParsingCommandLineArguments : BaseFixture
@@ -59,6 +59,11 @@ public class WhenParsingCommandLineArguments : BaseFixture
 
         private static readonly string ExpectedVersionString = string.Format(@"Pickles version {0}", Assembly.GetExecutingAssembly().GetName().Version);
 
+        public WhenParsingCommandLineArguments()
+            : base(Assembly.GetExecutingAssembly().Location)
+        {
+        }
+
         [Test]
         public void ThenCanParseExcelDocumentationFormatWithLongFormSuccessfully()
         {
@@ -610,5 +615,11 @@ public void ThenCanParseExcludeTagsSuccessfully()
             Check.That(shouldContinue).IsTrue();
             Check.That(configuration.ExcludeTags).IsEqualTo("exclude-tag");
         }
+
+        [Test]
+        public void Two_Plus_Two_Equals_Five()
+        {
+            //Check.That(2 + 2).Equals(5);
+        }
     }
 }
diff --git a/src/Pickles/Pickles.CommandLine.UnitTests/packages.config b/src/Pickles/Pickles.CommandLine.UnitTests/packages.config
new file mode 100644
index 000000000..262036f9e
--- /dev/null
+++ b/src/Pickles/Pickles.CommandLine.UnitTests/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NFluent" version="1.3.1.0" targetFramework="net45" />
+  <package id="NUnit" version="3.7.0" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
+  <package id="System.IO.Abstractions.TestingHelpers" version="2.0.0.143" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles/CommandLineArgumentParser.cs b/src/Pickles/Pickles.CommandLine/CommandLineArgumentParser.cs
similarity index 99%
rename from src/Pickles/Pickles/CommandLineArgumentParser.cs
rename to src/Pickles/Pickles.CommandLine/CommandLineArgumentParser.cs
index 8f7567f87..c0bc56224 100644
--- a/src/Pickles/Pickles/CommandLineArgumentParser.cs
+++ b/src/Pickles/Pickles.CommandLine/CommandLineArgumentParser.cs
@@ -20,15 +20,13 @@
 
 using System;
 using System.IO.Abstractions;
-using System.Linq;
 using System.Reflection;
-
 using NDesk.Options;
+using PicklesDoc.Pickles.Extensions;
 
 using TextWriter = System.IO.TextWriter;
-using PicklesDoc.Pickles.Extensions;
 
-namespace PicklesDoc.Pickles
+namespace PicklesDoc.Pickles.CommandLine
 {
     public class CommandLineArgumentParser
     {
diff --git a/src/Pickles/Pickles.CommandLine/NLog.xsd b/src/Pickles/Pickles.CommandLine/NLog.xsd
index b1bb9f9d7..6b2604233 100644
--- a/src/Pickles/Pickles.CommandLine/NLog.xsd
+++ b/src/Pickles/Pickles.CommandLine/NLog.xsd
@@ -42,12 +42,32 @@
     </xs:attribute>
     <xs:attribute name="throwExceptions" type="xs:boolean">
       <xs:annotation>
-        <xs:documentation>Pass NLog internal exceptions to the application. Default value is: false.</xs:documentation>
+        <xs:documentation>Throw an exception when there is an internal error. Default value is: false.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="throwConfigExceptions" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Throw an exception when there is a configuration error. If not set, determined by throwExceptions.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="keepVariablesOnReload" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Gets or sets a value indicating whether Variables should be kept on configuration reload. Default value is: false.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="internalLogToTrace" type="xs:boolean">
       <xs:annotation>
-        <xs:documentation>Write internal NLog messages to the the System.Diagnostics.Trace. Default value is: false</xs:documentation>
+        <xs:documentation>Write internal NLog messages to the System.Diagnostics.Trace. Default value is: false.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="internalLogIncludeTimestamp" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Write timestamps for internal NLog messages. Default value is: true.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="useInvariantCulture" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Use InvariantCulture as default culture instead of CurrentCulture.  Default value is: false.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
   </xs:complexType>
@@ -174,7 +194,7 @@
   <xs:complexType name="NLogInclude">
     <xs:attribute name="file" type="SimpleLayoutAttribute" use="required">
       <xs:annotation>
-        <xs:documentation>Name of the file to be included. The name is relative to the name of the current config file.</xs:documentation>
+        <xs:documentation>Name of the file to be included. You could use * wildcard. The name is relative to the name of the current config file.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="ignoreErrors" type="xs:boolean" use="optional" default="false">
@@ -306,6 +326,7 @@
       <xs:extension base="WrapperTargetBase">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="asyncFlush" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="condition" minOccurs="0" maxOccurs="1" type="Condition" />
           <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
@@ -314,6 +335,11 @@
             <xs:documentation>Name of the target.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="asyncFlush" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Delay the flush until the LogEvent has been confirmed as written</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="condition" type="Condition">
           <xs:annotation>
             <xs:documentation>Condition expression. Log events who meet this condition will cause a flush on the wrapped target.</xs:documentation>
@@ -383,13 +409,14 @@
           <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.NLogViewerParameterInfo" />
-          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeCallSite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="appInfo" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="ndcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
@@ -457,9 +484,9 @@
             <xs:documentation>Maximum queue size.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeMdc" type="xs:boolean">
+        <xs:attribute name="includeNdc" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
+            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="includeSourceInfo" type="xs:boolean">
@@ -472,9 +499,9 @@
             <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeNdc" type="xs:boolean">
+        <xs:attribute name="includeMdc" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
+            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="includeCallSite" type="xs:boolean">
@@ -492,6 +519,11 @@
             <xs:documentation>NDC item separator.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="includeMdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
@@ -981,6 +1013,7 @@
           <xs:element name="source" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.EventLogTargetOverflowAction" />
           <xs:element name="entryType" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="maxKilobytes" minOccurs="0" maxOccurs="1" type="xs:long" />
           <xs:element name="maxMessageLength" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
@@ -1029,6 +1062,11 @@
             <xs:documentation>Optional entrytype. When not set, or when not convertable to  then determined by </xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="maxKilobytes" type="xs:long">
+          <xs:annotation>
+            <xs:documentation>Maximum Event log size in kilobytes. If null, the value won't be set. Default is 512 Kilobytes as specified by Eventlog API</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="maxMessageLength" type="xs:integer">
           <xs:annotation>
             <xs:documentation>Message length limit to write to the Event Log.</xs:documentation>
@@ -1327,6 +1365,13 @@
       <xs:enumeration value="Day" />
       <xs:enumeration value="Hour" />
       <xs:enumeration value="Minute" />
+      <xs:enumeration value="Sunday" />
+      <xs:enumeration value="Monday" />
+      <xs:enumeration value="Tuesday" />
+      <xs:enumeration value="Wednesday" />
+      <xs:enumeration value="Thursday" />
+      <xs:enumeration value="Friday" />
+      <xs:enumeration value="Saturday" />
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="NLog.Targets.FilePathKind">
@@ -1560,6 +1605,7 @@
     <xs:choice minOccurs="0" maxOccurs="unbounded">
       <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
       <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="parameterType" minOccurs="0" maxOccurs="1" type="xs:string" />
       <xs:element name="type" minOccurs="0" maxOccurs="1" type="xs:string" />
     </xs:choice>
     <xs:attribute name="layout" type="SimpleLayoutAttribute">
@@ -1572,11 +1618,16 @@
         <xs:documentation>Name of the parameter.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="type" type="xs:string">
+    <xs:attribute name="parameterType" type="xs:string">
       <xs:annotation>
         <xs:documentation>Type of the parameter.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
+    <xs:attribute name="type" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type of the parameter. Obsolete alias for </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
   </xs:complexType>
   <xs:complexType name="Mail">
     <xs:complexContent>
@@ -1993,13 +2044,14 @@
           <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.NLogViewerParameterInfo" />
-          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeCallSite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="appInfo" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="ndcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
@@ -2067,9 +2119,9 @@
             <xs:documentation>Maximum queue size.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeMdc" type="xs:boolean">
+        <xs:attribute name="includeNdc" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
+            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="includeSourceInfo" type="xs:boolean">
@@ -2082,9 +2134,9 @@
             <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeNdc" type="xs:boolean">
+        <xs:attribute name="includeMdc" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
+            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="includeCallSite" type="xs:boolean">
@@ -2102,6 +2154,11 @@
             <xs:documentation>NDC item separator.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="includeMdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
@@ -2650,8 +2707,10 @@
           <xs:element name="attribute" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.JsonAttribute" />
           <xs:element name="excludeProperties" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="renderEmptyObject" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="suppressSpaces" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="excludeProperties" type="xs:string">
           <xs:annotation>
@@ -2663,6 +2722,11 @@
             <xs:documentation>Option to include all properties from the log events</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="includeMdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="renderEmptyObject" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Option to render the empty object value {}</xs:documentation>
@@ -2673,12 +2737,18 @@
             <xs:documentation>Option to suppress the extra spaces in the output json</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="includeMdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
   <xs:complexType name="NLog.Layouts.JsonAttribute">
     <xs:choice minOccurs="0" maxOccurs="unbounded">
       <xs:element name="encode" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="escapeUnicode" minOccurs="0" maxOccurs="1" type="xs:boolean" />
       <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
       <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
     </xs:choice>
@@ -2687,6 +2757,11 @@
         <xs:documentation>Determines wether or not this attribute will be Json encoded.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
+    <xs:attribute name="escapeUnicode" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Indicates whether to escape non-ascii characters</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
     <xs:attribute name="layout" type="SimpleLayoutAttribute">
       <xs:annotation>
         <xs:documentation>Layout that will be rendered as the attribute's value.</xs:documentation>
@@ -2727,7 +2802,26 @@
   <xs:complexType name="Log4JXmlEventLayout">
     <xs:complexContent>
       <xs:extension base="Layout">
-        <xs:choice minOccurs="0" maxOccurs="unbounded" />
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="includeAllProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to include all properties from the log events</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
diff --git a/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.csproj b/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.csproj
index 3bdfb6938..899ecd7d5 100644
--- a/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.csproj
+++ b/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.csproj
@@ -42,21 +42,21 @@
     <StartupObject>PicklesDoc.Pickles.CommandLine.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NDesk.Options">
       <HintPath>..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.2\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.10\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
@@ -68,6 +68,7 @@
     <Compile Include="..\VersionInfo.cs">
       <Link>VersionInfo.cs</Link>
     </Compile>
+    <Compile Include="CommandLineArgumentParser.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
diff --git a/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.v3.ncrunchproject b/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.v3.ncrunchproject
new file mode 100644
index 000000000..3cd9a982c
--- /dev/null
+++ b/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.v3.ncrunchproject
@@ -0,0 +1,6 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
+    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.CommandLine/Program.cs b/src/Pickles/Pickles.CommandLine/Program.cs
index da79a71df..bae3b1d61 100644
--- a/src/Pickles/Pickles.CommandLine/Program.cs
+++ b/src/Pickles/Pickles.CommandLine/Program.cs
@@ -36,6 +36,7 @@ private static int Main(string[] args)
             builder.RegisterAssemblyTypes(typeof(Runner).Assembly);
             builder.Register<FileSystem>(_ => new FileSystem()).As<IFileSystem>().SingleInstance();
             builder.RegisterModule<PicklesModule>();
+            builder.RegisterType<CommandLineArgumentParser>();
             var container = builder.Build();
 
             var configuration = container.Resolve<IConfiguration>();
diff --git a/src/Pickles/Pickles.CommandLine/packages.config b/src/Pickles/Pickles.CommandLine/packages.config
index 9ca9ed3e9..e1ffc1a9c 100644
--- a/src/Pickles/Pickles.CommandLine/packages.config
+++ b/src/Pickles/Pickles.CommandLine/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
   <package id="NDesk.Options" version="0.2.1" />
-  <package id="NLog" version="4.4.2" targetFramework="net45" />
-  <package id="NLog.Config" version="4.4.2" targetFramework="net45" />
-  <package id="NLog.Schema" version="4.4.2" targetFramework="net45" />
-  <package id="System.IO.Abstractions" version="2.0.0.140" targetFramework="net45" />
+  <package id="NLog" version="4.4.10" targetFramework="net45" />
+  <package id="NLog.Config" version="4.4.10" targetFramework="net45" />
+  <package id="NLog.Schema" version="4.4.10" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Cucumber.UnitTests/Pickles.DocumentationBuilders.Cucumber.UnitTests.csproj b/src/Pickles/Pickles.DocumentationBuilders.Cucumber.UnitTests/Pickles.DocumentationBuilders.Cucumber.UnitTests.csproj
index 38085d1da..faba5a683 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Cucumber.UnitTests/Pickles.DocumentationBuilders.Cucumber.UnitTests.csproj
+++ b/src/Pickles/Pickles.DocumentationBuilders.Cucumber.UnitTests/Pickles.DocumentationBuilders.Cucumber.UnitTests.csproj
@@ -36,25 +36,25 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NFluent, Version=1.3.1.0, Culture=neutral, PublicKeyToken=18828b37b84b1437, processorArchitecture=MSIL">
       <HintPath>..\packages\NFluent.1.3.1.0\lib\net40\NFluent.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.7.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.7.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\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>
+    <Reference Include="System.IO.Abstractions.TestingHelpers, Version=2.0.0.143, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.TestingHelpers.2.0.0.143\lib\net40\System.IO.Abstractions.TestingHelpers.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="TechTalk.SpecFlow, Version=2.1.0.0, Culture=neutral, PublicKeyToken=0778194805d6db41, processorArchitecture=MSIL">
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Cucumber.UnitTests/packages.config b/src/Pickles/Pickles.DocumentationBuilders.Cucumber.UnitTests/packages.config
index 4a90dcd7e..d620121c7 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Cucumber.UnitTests/packages.config
+++ b/src/Pickles/Pickles.DocumentationBuilders.Cucumber.UnitTests/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
   <package id="NFluent" version="1.3.1.0" targetFramework="net452" />
-  <package id="NUnit" version="3.6.0" targetFramework="net45" />
+  <package id="NUnit" version="3.7.0" targetFramework="net45" />
   <package id="SpecFlow" version="2.1.0" targetFramework="net452" />
-  <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" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
+  <package id="System.IO.Abstractions.TestingHelpers" version="2.0.0.143" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Cucumber/Pickles.DocumentationBuilders.Cucumber.csproj b/src/Pickles/Pickles.DocumentationBuilders.Cucumber/Pickles.DocumentationBuilders.Cucumber.csproj
index 17fc76058..2eb676709 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Cucumber/Pickles.DocumentationBuilders.Cucumber.csproj
+++ b/src/Pickles/Pickles.DocumentationBuilders.Cucumber/Pickles.DocumentationBuilders.Cucumber.csproj
@@ -31,18 +31,18 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.2\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.10\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Cucumber/packages.config b/src/Pickles/Pickles.DocumentationBuilders.Cucumber/packages.config
index a75e0c090..582da3df3 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Cucumber/packages.config
+++ b/src/Pickles/Pickles.DocumentationBuilders.Cucumber/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
-  <package id="NLog" version="4.4.2" targetFramework="net45" />
-  <package id="System.IO.Abstractions" version="2.0.0.140" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
+  <package id="NLog" version="4.4.10" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Dhtml.UnitTests/Pickles.DocumentationBuilders.Dhtml.UnitTests.csproj b/src/Pickles/Pickles.DocumentationBuilders.Dhtml.UnitTests/Pickles.DocumentationBuilders.Dhtml.UnitTests.csproj
index 315e10a48..3f904990e 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Dhtml.UnitTests/Pickles.DocumentationBuilders.Dhtml.UnitTests.csproj
+++ b/src/Pickles/Pickles.DocumentationBuilders.Dhtml.UnitTests/Pickles.DocumentationBuilders.Dhtml.UnitTests.csproj
@@ -34,18 +34,18 @@
       <HintPath>..\packages\NFluent.1.3.1.0\lib\net40\NFluent.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.7.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.7.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\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>
+    <Reference Include="System.IO.Abstractions.TestingHelpers, Version=2.0.0.143, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.TestingHelpers.2.0.0.143\lib\net40\System.IO.Abstractions.TestingHelpers.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Dhtml.UnitTests/packages.config b/src/Pickles/Pickles.DocumentationBuilders.Dhtml.UnitTests/packages.config
index 977b76224..262036f9e 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Dhtml.UnitTests/packages.config
+++ b/src/Pickles/Pickles.DocumentationBuilders.Dhtml.UnitTests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <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" />
+  <package id="NUnit" version="3.7.0" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
+  <package id="System.IO.Abstractions.TestingHelpers" version="2.0.0.143" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Dhtml/Pickles.DocumentationBuilders.Dhtml.csproj b/src/Pickles/Pickles.DocumentationBuilders.Dhtml/Pickles.DocumentationBuilders.Dhtml.csproj
index d4e3f61fa..83d304e21 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Dhtml/Pickles.DocumentationBuilders.Dhtml.csproj
+++ b/src/Pickles/Pickles.DocumentationBuilders.Dhtml/Pickles.DocumentationBuilders.Dhtml.csproj
@@ -30,18 +30,18 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.2\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.10\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Dhtml/packages.config b/src/Pickles/Pickles.DocumentationBuilders.Dhtml/packages.config
index 067b0f1ec..1c13941c7 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Dhtml/packages.config
+++ b/src/Pickles/Pickles.DocumentationBuilders.Dhtml/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
-  <package id="NLog" version="4.4.2" targetFramework="net45" />
-  <package id="System.IO.Abstractions" version="2.0.0.140" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
+  <package id="NLog" version="4.4.10" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Excel.UnitTests/Pickles.DocumentationBuilders.Excel.UnitTests.csproj b/src/Pickles/Pickles.DocumentationBuilders.Excel.UnitTests/Pickles.DocumentationBuilders.Excel.UnitTests.csproj
index 4d1cee126..d14f11092 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Excel.UnitTests/Pickles.DocumentationBuilders.Excel.UnitTests.csproj
+++ b/src/Pickles/Pickles.DocumentationBuilders.Excel.UnitTests/Pickles.DocumentationBuilders.Excel.UnitTests.csproj
@@ -30,12 +30,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ClosedXML, Version=0.85.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClosedXML.0.85.0\lib\net40\ClosedXML.dll</HintPath>
+    <Reference Include="ClosedXML, Version=0.87.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClosedXML.0.87.1\lib\net40\ClosedXML.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -46,8 +46,8 @@
       <HintPath>..\packages\NFluent.1.3.1.0\lib\net40\NFluent.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.7.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.7.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Excel.UnitTests/packages.config b/src/Pickles/Pickles.DocumentationBuilders.Excel.UnitTests/packages.config
index 47687a222..1d0d391b3 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Excel.UnitTests/packages.config
+++ b/src/Pickles/Pickles.DocumentationBuilders.Excel.UnitTests/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
-  <package id="ClosedXML" version="0.85.0" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
+  <package id="ClosedXML" version="0.87.1" targetFramework="net45" />
   <package id="DocumentFormat.OpenXml" version="2.5" targetFramework="net45" />
   <package id="NFluent" version="1.3.1.0" targetFramework="net45" />
-  <package id="NUnit" version="3.6.0" targetFramework="net45" />
+  <package id="NUnit" version="3.7.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Excel/Pickles.DocumentationBuilders.Excel.csproj b/src/Pickles/Pickles.DocumentationBuilders.Excel/Pickles.DocumentationBuilders.Excel.csproj
index 4a38ce8d5..4ba4067ed 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Excel/Pickles.DocumentationBuilders.Excel.csproj
+++ b/src/Pickles/Pickles.DocumentationBuilders.Excel/Pickles.DocumentationBuilders.Excel.csproj
@@ -30,12 +30,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ClosedXML, Version=0.85.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClosedXML.0.85.0\lib\net40\ClosedXML.dll</HintPath>
+    <Reference Include="ClosedXML, Version=0.87.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClosedXML.0.87.1\lib\net40\ClosedXML.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -43,13 +43,13 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.2\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.10\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Excel/packages.config b/src/Pickles/Pickles.DocumentationBuilders.Excel/packages.config
index 72cb4f363..021f03f3f 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Excel/packages.config
+++ b/src/Pickles/Pickles.DocumentationBuilders.Excel/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
-  <package id="ClosedXML" version="0.85.0" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
+  <package id="ClosedXML" version="0.87.1" targetFramework="net45" />
   <package id="DocumentFormat.OpenXml" version="2.5" targetFramework="net45" />
-  <package id="NLog" version="4.4.2" targetFramework="net45" />
-  <package id="System.IO.Abstractions" version="2.0.0.140" targetFramework="net45" />
+  <package id="NLog" version="4.4.10" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
 </packages>
\ No newline at end of file
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 4b24df14e..2ae3a7107 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
@@ -30,26 +30,26 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NFluent, Version=1.3.1.0, Culture=neutral, PublicKeyToken=18828b37b84b1437, processorArchitecture=MSIL">
       <HintPath>..\packages\NFluent.1.3.1.0\lib\net40\NFluent.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.7.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.7.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\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>
+    <Reference Include="System.IO.Abstractions.TestingHelpers, Version=2.0.0.143, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.TestingHelpers.2.0.0.143\lib\net40\System.IO.Abstractions.TestingHelpers.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Html.UnitTests/packages.config b/src/Pickles/Pickles.DocumentationBuilders.Html.UnitTests/packages.config
index d6ce66364..5099811e9 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Html.UnitTests/packages.config
+++ b/src/Pickles/Pickles.DocumentationBuilders.Html.UnitTests/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
   <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" />
+  <package id="NUnit" version="3.7.0" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
+  <package id="System.IO.Abstractions.TestingHelpers" version="2.0.0.143" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Html/Pickles.DocumentationBuilders.Html.csproj b/src/Pickles/Pickles.DocumentationBuilders.Html/Pickles.DocumentationBuilders.Html.csproj
index 3659432f1..17a62355e 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Html/Pickles.DocumentationBuilders.Html.csproj
+++ b/src/Pickles/Pickles.DocumentationBuilders.Html/Pickles.DocumentationBuilders.Html.csproj
@@ -30,19 +30,19 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.2\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.10\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Html/packages.config b/src/Pickles/Pickles.DocumentationBuilders.Html/packages.config
index 067b0f1ec..1c13941c7 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Html/packages.config
+++ b/src/Pickles/Pickles.DocumentationBuilders.Html/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
-  <package id="NLog" version="4.4.2" targetFramework="net45" />
-  <package id="System.IO.Abstractions" version="2.0.0.140" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
+  <package id="NLog" version="4.4.10" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Json.UnitTests/Pickles.DocumentationBuilders.Json.UnitTests.csproj b/src/Pickles/Pickles.DocumentationBuilders.Json.UnitTests/Pickles.DocumentationBuilders.Json.UnitTests.csproj
index 2c1d8a60c..81835b0d2 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Json.UnitTests/Pickles.DocumentationBuilders.Json.UnitTests.csproj
+++ b/src/Pickles/Pickles.DocumentationBuilders.Json.UnitTests/Pickles.DocumentationBuilders.Json.UnitTests.csproj
@@ -30,26 +30,26 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NFluent, Version=1.3.1.0, Culture=neutral, PublicKeyToken=18828b37b84b1437, processorArchitecture=MSIL">
       <HintPath>..\packages\NFluent.1.3.1.0\lib\net40\NFluent.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.7.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.7.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\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>
+    <Reference Include="System.IO.Abstractions.TestingHelpers, Version=2.0.0.143, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.TestingHelpers.2.0.0.143\lib\net40\System.IO.Abstractions.TestingHelpers.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Json.UnitTests/packages.config b/src/Pickles/Pickles.DocumentationBuilders.Json.UnitTests/packages.config
index d6ce66364..5099811e9 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Json.UnitTests/packages.config
+++ b/src/Pickles/Pickles.DocumentationBuilders.Json.UnitTests/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
   <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" />
+  <package id="NUnit" version="3.7.0" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
+  <package id="System.IO.Abstractions.TestingHelpers" version="2.0.0.143" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Json/Pickles.DocumentationBuilders.Json.csproj b/src/Pickles/Pickles.DocumentationBuilders.Json/Pickles.DocumentationBuilders.Json.csproj
index fca9ca153..fa97eeaec 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Json/Pickles.DocumentationBuilders.Json.csproj
+++ b/src/Pickles/Pickles.DocumentationBuilders.Json/Pickles.DocumentationBuilders.Json.csproj
@@ -30,22 +30,22 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.2\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.10\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Json/packages.config b/src/Pickles/Pickles.DocumentationBuilders.Json/packages.config
index 20023d7cb..402db5318 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Json/packages.config
+++ b/src/Pickles/Pickles.DocumentationBuilders.Json/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="NLog" version="4.4.2" targetFramework="net45" />
-  <package id="System.IO.Abstractions" version="2.0.0.140" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
+  <package id="NLog" version="4.4.10" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Word.UnitTests/Pickles.DocumentationBuilders.Word.UnitTests.csproj b/src/Pickles/Pickles.DocumentationBuilders.Word.UnitTests/Pickles.DocumentationBuilders.Word.UnitTests.csproj
index af1310260..c6b7a9e76 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Word.UnitTests/Pickles.DocumentationBuilders.Word.UnitTests.csproj
+++ b/src/Pickles/Pickles.DocumentationBuilders.Word.UnitTests/Pickles.DocumentationBuilders.Word.UnitTests.csproj
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -42,18 +42,18 @@
       <HintPath>..\packages\NFluent.1.3.1.0\lib\net40\NFluent.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.7.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.7.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\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>
+    <Reference Include="System.IO.Abstractions.TestingHelpers, Version=2.0.0.143, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.TestingHelpers.2.0.0.143\lib\net40\System.IO.Abstractions.TestingHelpers.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Word.UnitTests/packages.config b/src/Pickles/Pickles.DocumentationBuilders.Word.UnitTests/packages.config
index a351d777e..ccb576abb 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Word.UnitTests/packages.config
+++ b/src/Pickles/Pickles.DocumentationBuilders.Word.UnitTests/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
   <package id="DocumentFormat.OpenXml" version="2.5" targetFramework="net45" />
   <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" />
+  <package id="NUnit" version="3.7.0" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
+  <package id="System.IO.Abstractions.TestingHelpers" version="2.0.0.143" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Word/Pickles.DocumentationBuilders.Word.csproj b/src/Pickles/Pickles.DocumentationBuilders.Word/Pickles.DocumentationBuilders.Word.csproj
index 0cea02898..b578f6155 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Word/Pickles.DocumentationBuilders.Word.csproj
+++ b/src/Pickles/Pickles.DocumentationBuilders.Word/Pickles.DocumentationBuilders.Word.csproj
@@ -31,21 +31,21 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="DocumentFormat.OpenXml">
       <HintPath>..\packages\DocumentFormat.OpenXml.2.5\lib\DocumentFormat.OpenXml.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.2\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.10\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Word/packages.config b/src/Pickles/Pickles.DocumentationBuilders.Word/packages.config
index 067b0f1ec..1c13941c7 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Word/packages.config
+++ b/src/Pickles/Pickles.DocumentationBuilders.Word/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
-  <package id="NLog" version="4.4.2" targetFramework="net45" />
-  <package id="System.IO.Abstractions" version="2.0.0.140" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
+  <package id="NLog" version="4.4.10" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.csproj b/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.csproj
index 5aee4d084..ceb1c6add 100644
--- a/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.csproj
+++ b/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.csproj
@@ -37,8 +37,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Framework" />
@@ -46,8 +46,8 @@
     <Reference Include="Microsoft.Build.Utilities.v3.5" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
diff --git a/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.nuspec b/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.nuspec
index b8e8cd757..048f558ea 100644
--- a/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.nuspec
+++ b/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.nuspec
@@ -42,7 +42,6 @@
     <file src="DocumentFormat.OpenXml.dll" target="tools" />
     <file src="Gherkin.dll" target="tools" />
     <file src="MarkdownDeep.dll" target="tools" />
-    <file src="NDesk.Options.dll" target="tools" />
     <file src="Newtonsoft.Json.dll" target="tools" />
     <file src="NLog.dll" target="tools" />
     <file src="PicklesDoc.Pickles.Library.dll" target="tools" />
diff --git a/src/Pickles/Pickles.MSBuild/packages.config b/src/Pickles/Pickles.MSBuild/packages.config
index 7f46a6507..e9c21cbde 100644
--- a/src/Pickles/Pickles.MSBuild/packages.config
+++ b/src/Pickles/Pickles.MSBuild/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
-  <package id="System.IO.Abstractions" version="2.0.0.140" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.ObjectModel/Pickles.ObjectModel.csproj b/src/Pickles/Pickles.ObjectModel/Pickles.ObjectModel.csproj
index 4318a59ab..e5306b9a1 100644
--- a/src/Pickles/Pickles.ObjectModel/Pickles.ObjectModel.csproj
+++ b/src/Pickles/Pickles.ObjectModel/Pickles.ObjectModel.csproj
@@ -32,8 +32,8 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
diff --git a/src/Pickles/Pickles.ObjectModel/packages.config b/src/Pickles/Pickles.ObjectModel/packages.config
index 6757047c3..6e4fa92cc 100644
--- a/src/Pickles/Pickles.ObjectModel/packages.config
+++ b/src/Pickles/Pickles.ObjectModel/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="System.IO.Abstractions" version="2.0.0.140" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.PowerShell/Pickle_Features.cs b/src/Pickles/Pickles.PowerShell/Pickle_Features.cs
index 40910c912..0fe5e8c0f 100644
--- a/src/Pickles/Pickles.PowerShell/Pickle_Features.cs
+++ b/src/Pickles/Pickles.PowerShell/Pickle_Features.cs
@@ -33,37 +33,37 @@ namespace PicklesDoc.Pickles.PowerShell
     [Cmdlet("Pickle", "Features")]
     public class Pickle_Features : PSCmdlet
     {
-        [Parameter(HelpMessage = CommandLineArgumentParser.HelpFeatureDir, Mandatory = true)]
+        [Parameter(HelpMessage = CommandLinArgumentHelpTexts.HelpFeatureDir, Mandatory = true)]
         public string FeatureDirectory { get; set; }
 
-        [Parameter(HelpMessage = CommandLineArgumentParser.HelpOutputDir, Mandatory = true)]
+        [Parameter(HelpMessage = CommandLinArgumentHelpTexts.HelpOutputDir, Mandatory = true)]
         public string OutputDirectory { get; set; }
 
-        [Parameter(HelpMessage = CommandLineArgumentParser.HelpLanguageFeatureFiles, Mandatory = false)]
+        [Parameter(HelpMessage = CommandLinArgumentHelpTexts.HelpLanguageFeatureFiles, Mandatory = false)]
         public string Language { get; set; }
 
-        [Parameter(HelpMessage = CommandLineArgumentParser.HelpTestResultsFormat, Mandatory = false)]
+        [Parameter(HelpMessage = CommandLinArgumentHelpTexts.HelpTestResultsFormat, Mandatory = false)]
         public string TestResultsFormat { get; set; }
 
-        [Parameter(HelpMessage = CommandLineArgumentParser.HelpTestResultsFile, Mandatory = false)]
+        [Parameter(HelpMessage = CommandLinArgumentHelpTexts.HelpTestResultsFile, Mandatory = false)]
         public string TestResultsFile { get; set; }
 
-        [Parameter(HelpMessage = CommandLineArgumentParser.HelpSutName, Mandatory = false)]
+        [Parameter(HelpMessage = CommandLinArgumentHelpTexts.HelpSutName, Mandatory = false)]
         public string SystemUnderTestName { get; set; }
 
-        [Parameter(HelpMessage = CommandLineArgumentParser.HelpSutVersion, Mandatory = false)]
+        [Parameter(HelpMessage = CommandLinArgumentHelpTexts.HelpSutVersion, Mandatory = false)]
         public string SystemUnderTestVersion { get; set; }
 
-        [Parameter(HelpMessage = CommandLineArgumentParser.HelpDocumentationFormat, Mandatory = false)]
+        [Parameter(HelpMessage = CommandLinArgumentHelpTexts.HelpDocumentationFormat, Mandatory = false)]
         public string DocumentationFormat { get; set; }
 
-        [Parameter(HelpMessage = CommandLineArgumentParser.HelpIncludeExperimentalFeatures, Mandatory = false)]
+        [Parameter(HelpMessage = CommandLinArgumentHelpTexts.HelpIncludeExperimentalFeatures, Mandatory = false)]
         public SwitchParameter IncludeExperimentalFeatures { get; set; }
 
-        [Parameter(HelpMessage = CommandLineArgumentParser.HelpEnableComments, Mandatory = false)]
+        [Parameter(HelpMessage = CommandLinArgumentHelpTexts.HelpEnableComments, Mandatory = false)]
         public string EnableComments { get; set; }
 
-        [Parameter(HelpMessage = CommandLineArgumentParser.HelpExcludeTags, Mandatory = false)]
+        [Parameter(HelpMessage = CommandLinArgumentHelpTexts.HelpExcludeTags, Mandatory = false)]
         public string ExcludeTags { get; set; }
 
         protected override void ProcessRecord()
diff --git a/src/Pickles/Pickles.PowerShell/Pickles.PowerShell.csproj b/src/Pickles/Pickles.PowerShell/Pickles.PowerShell.csproj
index 21182375c..6293e4234 100644
--- a/src/Pickles/Pickles.PowerShell/Pickles.PowerShell.csproj
+++ b/src/Pickles/Pickles.PowerShell/Pickles.PowerShell.csproj
@@ -37,14 +37,14 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Management" />
diff --git a/src/Pickles/Pickles.PowerShell/Pickles.nuspec b/src/Pickles/Pickles.PowerShell/Pickles.nuspec
index 2f29dc613..350996669 100644
--- a/src/Pickles/Pickles.PowerShell/Pickles.nuspec
+++ b/src/Pickles/Pickles.PowerShell/Pickles.nuspec
@@ -42,7 +42,6 @@
     <file src="DocumentFormat.OpenXml.dll" target="tools" />
     <file src="Gherkin.dll" target="tools" />
     <file src="MarkdownDeep.dll" target="tools" />
-    <file src="NDesk.Options.dll" target="tools" />
     <file src="Newtonsoft.Json.dll" target="tools" />
     <file src="NLog.dll" target="tools" />
     <file src="PicklesDoc.Pickles.Library.dll" target="tools" />
diff --git a/src/Pickles/Pickles.PowerShell/packages.config b/src/Pickles/Pickles.PowerShell/packages.config
index 7f46a6507..e9c21cbde 100644
--- a/src/Pickles/Pickles.PowerShell/packages.config
+++ b/src/Pickles/Pickles.PowerShell/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
-  <package id="System.IO.Abstractions" version="2.0.0.140" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.Test/BaseFixture.cs b/src/Pickles/Pickles.Test/BaseFixture.cs
index 0c2e229cc..60c1cd4e8 100644
--- a/src/Pickles/Pickles.Test/BaseFixture.cs
+++ b/src/Pickles/Pickles.Test/BaseFixture.cs
@@ -35,6 +35,17 @@ public class BaseFixture
         protected const string FileSystemPrefix = @"c:\temp\FakeFolderStructures\";
         protected const string ResourcePrefix = "PicklesDoc.Pickles.Test.FakeFolderStructures.";
         private IContainer container;
+        private readonly string currentDirectory;
+
+        public BaseFixture(string currentDirectory)
+        {
+            this.currentDirectory = currentDirectory;
+        }
+
+        public BaseFixture()
+            : this(Assembly.GetExecutingAssembly().Location)
+        {
+        }
 
         protected IContainer Container
         {
@@ -56,10 +67,10 @@ protected IContainer Container
             }
         }
 
-        private static MockFileSystem CreateMockFileSystem()
+        private MockFileSystem CreateMockFileSystem()
         {
             var mockFileSystem = new MockFileSystem();
-            mockFileSystem.Directory.SetCurrentDirectory(Assembly.GetExecutingAssembly().Location);
+            mockFileSystem.Directory.SetCurrentDirectory(this.currentDirectory);
             return mockFileSystem;
         }
 
diff --git a/src/Pickles/Pickles.Test/EncodingDetectorTests.cs b/src/Pickles/Pickles.Test/EncodingDetectorTests.cs
new file mode 100644
index 000000000..5d77d9664
--- /dev/null
+++ b/src/Pickles/Pickles.Test/EncodingDetectorTests.cs
@@ -0,0 +1,123 @@
+//  --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="EncodingDetectorTests.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 System.Text;
+using NFluent;
+using NUnit.Framework;
+
+namespace PicklesDoc.Pickles.Test
+{
+    [TestFixture]
+    public class EncodingDetectorTests : BaseFixture
+    {
+        [Test]
+        public void GetEncoding_NullArgument_ThrowsArgumentNullException()
+        {
+            var detector = this.CreateDetector();
+
+            Check.ThatCode(() => detector.GetEncoding(null)).Throws<ArgumentNullException>();
+        }
+
+        private EncodingDetector CreateDetector()
+        {
+            return new EncodingDetector(FileSystem);
+        }
+
+        [Test]
+        public void GetEncoding_FileDoesNotExist_DoesNotThrowException()
+        {
+            var detector = this.CreateDetector();
+
+            Check.ThatCode(() => detector.GetEncoding("file-does-not-exist.feature")).DoesNotThrow();
+        }
+
+        [Test]
+        public void GetEncoding_FileIsLessThanFourBytes_DoesNotThrowException()
+        {
+            FileSystem.AddFile("temp.feature", new MockFileData(new byte[3]));
+
+            var detector = this.CreateDetector();
+
+            Check.ThatCode(() => detector.GetEncoding("temp.feature")).DoesNotThrow();
+        }
+
+        [Test]
+        public void GetEncoding_UTF7BOM_ReturnsUTF()
+        {
+            FileSystem.AddFile("utf7.feature", new MockFileData(new byte[] { 0x2b, 0x2f, 0x76 }));
+
+            var detector = this.CreateDetector();
+
+            var encoding = detector.GetEncoding("utf7.feature");
+
+            Check.That(encoding).IsEqualTo(Encoding.UTF7);
+        }
+
+        [Test]
+        public void GetEncoding_UTF16LEBOM_ReturnsUnicode()
+        {
+            FileSystem.AddFile("utf16le.feature", new MockFileData(new byte[] { 0xff, 0xfe }));
+
+            var detector = this.CreateDetector();
+
+            var encoding = detector.GetEncoding("utf16le.feature");
+
+            Check.That(encoding).IsEqualTo(Encoding.Unicode);
+        }
+
+        [Test]
+        public void GetEncoding_UTF16BEBOM_ReturnsUnicode()
+        {
+            FileSystem.AddFile("utf16be.feature", new MockFileData(new byte[] { 0xfe, 0xff }));
+
+            var detector = this.CreateDetector();
+
+            var encoding = detector.GetEncoding("utf16be.feature");
+
+            Check.That(encoding).IsEqualTo(Encoding.BigEndianUnicode);
+        }
+
+        [Test]
+        public void GetEncoding_UTF32BOM_ReturnsUnicode()
+        {
+            FileSystem.AddFile("utf32.feature", new MockFileData(new byte[] { 0, 0, 0xfe, 0xff }));
+
+            var detector = this.CreateDetector();
+
+            var encoding = detector.GetEncoding("utf32.feature");
+
+            Check.That(encoding).IsEqualTo(Encoding.UTF32);
+        }
+
+        [Test]
+        public void GetEncoding_Default_ReturnsUTF8()
+        {
+            FileSystem.AddFile("other.feature", new MockFileData(new byte[] { 0xab, 0xcd, 0xef, 0x01 }));
+
+            var detector = this.CreateDetector();
+
+            var encoding = detector.GetEncoding("other.feature");
+
+            Check.That(encoding).IsEqualTo(Encoding.UTF8);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Pickles/Pickles.Test/Formatters/HtmlContentFormatterTests.cs b/src/Pickles/Pickles.Test/Formatters/HtmlContentFormatterTests.cs
index b79ad06d7..373125d1f 100644
--- a/src/Pickles/Pickles.Test/Formatters/HtmlContentFormatterTests.cs
+++ b/src/Pickles/Pickles.Test/Formatters/HtmlContentFormatterTests.cs
@@ -19,8 +19,8 @@
 //  --------------------------------------------------------------------------------------------------------------------
 
 using System;
-using Moq;
 using NFluent;
+using NSubstitute;
 using NUnit.Framework;
 using PicklesDoc.Pickles.DirectoryCrawler;
 using PicklesDoc.Pickles.DocumentationBuilders.Html;
@@ -42,7 +42,7 @@ public void Constructor_NullHtmlFeatureFormatter_ThrowsArgumentNullException()
         [Test]
         public void Constructor_NullHtmlIndexFormatter_ThrowsArgumentNullException()
         {
-            Check.ThatCode(() => new HtmlContentFormatter(new Mock<IHtmlFeatureFormatter>().Object, null))
+            Check.ThatCode(() => new HtmlContentFormatter(Substitute.For<IHtmlFeatureFormatter>(), null))
                 .Throws<ArgumentNullException>()
                 .WithProperty("ParamName", "htmlIndexFormatter");
         }
@@ -50,8 +50,8 @@ public void Constructor_NullHtmlIndexFormatter_ThrowsArgumentNullException()
         [Test]
         public void Format_ContentIsFeatureNode_UsesHtmlFeatureFormatterWithCorrectArgument()
         {
-            var fakeHtmlFeatureFormatter = new Mock<IHtmlFeatureFormatter>();
-            var formatter = new HtmlContentFormatter(fakeHtmlFeatureFormatter.Object, new HtmlIndexFormatter());
+            var fakeHtmlFeatureFormatter = Substitute.For<IHtmlFeatureFormatter>();
+            var formatter = new HtmlContentFormatter(fakeHtmlFeatureFormatter, new HtmlIndexFormatter());
 
             var featureNode = new FeatureNode(
                 FileSystem.FileInfo.FromFileName(@"c:\temp\test.feature"),
@@ -60,7 +60,7 @@ public void Format_ContentIsFeatureNode_UsesHtmlFeatureFormatterWithCorrectArgum
 
             formatter.Format(featureNode, new INode[0]);
 
-            fakeHtmlFeatureFormatter.Verify(f => f.Format(featureNode.Feature));
+            fakeHtmlFeatureFormatter.Received().Format(featureNode.Feature);
         }
     }
 }
diff --git a/src/Pickles/Pickles.Test/Formatters/HtmlScenarioOutlineFormatterTests.cs b/src/Pickles/Pickles.Test/Formatters/HtmlScenarioOutlineFormatterTests.cs
index 98552104c..550b4822f 100644
--- a/src/Pickles/Pickles.Test/Formatters/HtmlScenarioOutlineFormatterTests.cs
+++ b/src/Pickles/Pickles.Test/Formatters/HtmlScenarioOutlineFormatterTests.cs
@@ -23,13 +23,12 @@
 using System.Xml.Linq;
 
 using Autofac;
-using Moq;
 using NFluent;
+using NSubstitute;
 using NUnit.Framework;
 
 using PicklesDoc.Pickles.DocumentationBuilders.Html;
 using PicklesDoc.Pickles.ObjectModel;
-using PicklesDoc.Pickles.TestFrameworks;
 
 namespace PicklesDoc.Pickles.Test.Formatters
 {
@@ -41,14 +40,14 @@ public class HtmlScenarioOutlineFormatterTests : BaseFixture
         [SetUp]
         public void Setup()
         {
-            var fakeTestResults = new Mock<ITestResults>();
+            var fakeTestResults = Substitute.For<ITestResults>();
 
             this.formatter = new HtmlScenarioOutlineFormatter(
                 Container.Resolve<HtmlStepFormatter>(),
                 Container.Resolve<HtmlDescriptionFormatter>(),
                 Container.Resolve<HtmlTableFormatter>(),
                 Container.Resolve<HtmlImageResultFormatter>(),
-                fakeTestResults.Object,
+                fakeTestResults,
                 Container.Resolve<ILanguageServicesRegistry>());
         }
 
diff --git a/src/Pickles/Pickles.Test/Pickles.Test.csproj b/src/Pickles/Pickles.Test/Pickles.Test.csproj
index 822fa9422..ae3c68c77 100644
--- a/src/Pickles/Pickles.Test/Pickles.Test.csproj
+++ b/src/Pickles/Pickles.Test/Pickles.Test.csproj
@@ -35,16 +35,16 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ClosedXML, Version=0.85.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClosedXML.0.85.0\lib\net40\ClosedXML.dll</HintPath>
+    <Reference Include="ClosedXML, Version=0.87.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClosedXML.0.87.1\lib\net40\ClosedXML.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -55,31 +55,31 @@
       <HintPath>..\packages\Gherkin.4.0.0\lib\net45\Gherkin.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NFluent, Version=1.3.1.0, Culture=neutral, PublicKeyToken=18828b37b84b1437, processorArchitecture=MSIL">
       <HintPath>..\packages\NFluent.1.3.1.0\lib\net40\NFluent.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="NSubstitute, Version=2.0.3.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
+      <HintPath>..\packages\NSubstitute.2.0.3\lib\net45\NSubstitute.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.7.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.7.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\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>
+    <Reference Include="System.IO.Abstractions.TestingHelpers, Version=2.0.0.143, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.TestingHelpers.2.0.0.143\lib\net40\System.IO.Abstractions.TestingHelpers.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
@@ -103,6 +103,7 @@
     <Compile Include="DescriptionProcessorTests.cs" />
     <Compile Include="DirectoryCrawlers\ImageFileDetectorTests.cs" />
     <Compile Include="DirectoryCrawlers\RelevantFileDetectorTests.cs" />
+    <Compile Include="EncodingDetectorTests.cs" />
     <Compile Include="FeatureNodeFactoryTests.cs" />
     <Compile Include="FeatureParserTests.cs" />
     <Compile Include="FileSystemBasedFeatureParserTests.cs" />
@@ -158,7 +159,6 @@
     <Compile Include="ParserFileFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="WhenDeterminingRelevantFilesToConsider.cs" />
-    <Compile Include="WhenParsingCommandLineArguments.cs" />
     <Compile Include="WhenParsingFeatureFiles.cs" />
     <Compile Include="WhenParsingLocalizedFeatureFiles.cs" />
     <Compile Include="WhenResolvingADocumentationBuilder.cs" />
diff --git a/src/Pickles/Pickles.Test/packages.config b/src/Pickles/Pickles.Test/packages.config
index 03a56f8fd..4b1322704 100644
--- a/src/Pickles/Pickles.Test/packages.config
+++ b/src/Pickles/Pickles.Test/packages.config
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
   <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
-  <package id="ClosedXML" version="0.85.0" targetFramework="net45" />
+  <package id="ClosedXML" version="0.87.1" targetFramework="net45" />
   <package id="DocumentFormat.OpenXml" version="2.5" targetFramework="net45" />
   <package id="Gherkin" version="4.0.0" targetFramework="net45" />
-  <package id="Moq" version="4.5.30" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
   <package id="NFluent" version="1.3.1.0" targetFramework="net45" />
-  <package id="NUnit" version="3.6.0" targetFramework="net45" />
+  <package id="NSubstitute" version="2.0.3" targetFramework="net45" />
+  <package id="NUnit" version="3.7.0" targetFramework="net45" />
   <package id="SpecFlow" version="2.1.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" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
+  <package id="System.IO.Abstractions.TestingHelpers" version="2.0.0.143" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.TestFrameworks.UnitTests/Pickles.TestFrameworks.UnitTests.csproj b/src/Pickles/Pickles.TestFrameworks.UnitTests/Pickles.TestFrameworks.UnitTests.csproj
index e4be49f6b..6c9173958 100644
--- a/src/Pickles/Pickles.TestFrameworks.UnitTests/Pickles.TestFrameworks.UnitTests.csproj
+++ b/src/Pickles/Pickles.TestFrameworks.UnitTests/Pickles.TestFrameworks.UnitTests.csproj
@@ -30,35 +30,35 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.5.30\lib\net45\Moq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="NFluent, Version=1.3.1.0, Culture=neutral, PublicKeyToken=18828b37b84b1437, processorArchitecture=MSIL">
       <HintPath>..\packages\NFluent.1.3.1.0\lib\net40\NFluent.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="NSubstitute, Version=2.0.3.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
+      <HintPath>..\packages\NSubstitute.2.0.3\lib\net45\NSubstitute.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.7.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.7.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\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>
+    <Reference Include="System.IO.Abstractions.TestingHelpers, Version=2.0.0.143, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.TestingHelpers.2.0.0.143\lib\net40\System.IO.Abstractions.TestingHelpers.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />
diff --git a/src/Pickles/Pickles.TestFrameworks.UnitTests/SpecRun/WhenParsingMultipleTestResultsTests.cs b/src/Pickles/Pickles.TestFrameworks.UnitTests/SpecRun/WhenParsingMultipleTestResultsTests.cs
index 0b323fbab..3db0a3cdb 100644
--- a/src/Pickles/Pickles.TestFrameworks.UnitTests/SpecRun/WhenParsingMultipleTestResultsTests.cs
+++ b/src/Pickles/Pickles.TestFrameworks.UnitTests/SpecRun/WhenParsingMultipleTestResultsTests.cs
@@ -22,10 +22,10 @@
 using System.Collections.Generic;
 using System.IO.Abstractions;
 
-using Moq;
-
 using NFluent;
 
+using NSubstitute;
+
 using NUnit.Framework;
 
 using PicklesDoc.Pickles.ObjectModel;
@@ -43,7 +43,7 @@ public void GetFeatureResult_OnePassingOneInconclusive_ReturnsPassed()
             var testResults1 = SetupStubForGetFeatureResult(feature, TestResult.Passed);
             var testResults2 = SetupStubForGetFeatureResult(feature, TestResult.Inconclusive);
 
-            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1.Object, testResults2.Object);
+            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1, testResults2);
 
             var result = multipleTestResults.GetFeatureResult(feature);
 
@@ -63,10 +63,10 @@ public TestableMultipleTestResults(IEnumerable<SingleTestRunBase> testResults)
             }
         }
 
-        private static Mock<SingleTestRunBase> SetupStubForGetFeatureResult(Feature feature, TestResult resultOfGetFeatureResult)
+        private static SingleTestRunBase SetupStubForGetFeatureResult(Feature feature, TestResult resultOfGetFeatureResult)
         {
-            var testResults1 = new Mock<SingleTestRunBase>();
-            testResults1.Setup(ti => ti.GetFeatureResult(feature)).Returns(resultOfGetFeatureResult);
+            var testResults1 = Substitute.For<SingleTestRunBase>();
+            testResults1.GetFeatureResult(feature).Returns(resultOfGetFeatureResult);
             return testResults1;
         }
 
@@ -78,7 +78,7 @@ public void GetFeatureResult_OnePassingOneFailed_ReturnsPassed()
             var testResults1 = SetupStubForGetFeatureResult(feature, TestResult.Passed);
             var testResults2 = SetupStubForGetFeatureResult(feature, TestResult.Failed);
 
-            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1.Object, testResults2.Object);
+            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1, testResults2);
 
             var result = multipleTestResults.GetFeatureResult(feature);
 
@@ -93,7 +93,7 @@ public void GetFeatureResult_TwoInconclusive_ReturnsInconclusive()
             var testResults1 = SetupStubForGetFeatureResult(feature, TestResult.Inconclusive);
             var testResults2 = SetupStubForGetFeatureResult(feature, TestResult.Inconclusive);
 
-            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1.Object, testResults2.Object);
+            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1, testResults2);
 
             var result = multipleTestResults.GetFeatureResult(feature);
 
@@ -108,17 +108,17 @@ public void GetScenarioOutlineResult_OnePassingOneInconclusive_ReturnsPassed()
             var testResults1 = SetupStubForGetScenarioOutlineResult(TestResult.Passed);
             var testResults2 = SetupStubForGetScenarioOutlineResult(TestResult.Inconclusive);
 
-            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1.Object, testResults2.Object);
+            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1, testResults2);
 
             var result = multipleTestResults.GetScenarioOutlineResult(scenarioOutline);
 
             Check.That(result).IsEqualTo(TestResult.Passed);
         }
 
-        private static Mock<SingleTestRunBase> SetupStubForGetScenarioOutlineResult(TestResult resultOfGetFeatureResult)
+        private static SingleTestRunBase SetupStubForGetScenarioOutlineResult(TestResult resultOfGetFeatureResult)
         {
-            var testResults1 = new Mock<SingleTestRunBase>();
-            testResults1.Setup(ti => ti.GetScenarioOutlineResult(It.IsAny<ScenarioOutline>())).Returns(resultOfGetFeatureResult);
+            var testResults1 = Substitute.For<SingleTestRunBase>();
+            testResults1.GetScenarioOutlineResult(Arg.Any<ScenarioOutline>()).Returns(resultOfGetFeatureResult);
             return testResults1;
         }
 
@@ -130,7 +130,7 @@ public void GetScenarioOutlineResult_OnePassingOneFailing_ReturnsFailed()
             var testResults1 = SetupStubForGetScenarioOutlineResult(TestResult.Passed);
             var testResults2 = SetupStubForGetScenarioOutlineResult(TestResult.Failed);
 
-            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1.Object, testResults2.Object);
+            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1, testResults2);
 
             var result = multipleTestResults.GetScenarioOutlineResult(scenarioOutline);
 
@@ -145,7 +145,7 @@ public void GetScenarioOutlineResult_TwoInconclusive_ReturnsInconclusive()
             var testResults1 = SetupStubForGetScenarioOutlineResult(TestResult.Inconclusive);
             var testResults2 = SetupStubForGetScenarioOutlineResult(TestResult.Inconclusive);
 
-            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1.Object, testResults2.Object);
+            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1, testResults2);
 
             var result = multipleTestResults.GetScenarioOutlineResult(scenarioOutline);
 
@@ -160,17 +160,17 @@ public void GetScenarioResult_OnePassingOneInconclusive_ReturnsPassed()
             var testResults1 = SetupStubForGetScenarioResult(TestResult.Passed);
             var testResults2 = SetupStubForGetScenarioResult(TestResult.Inconclusive);
 
-            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1.Object, testResults2.Object);
+            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1, testResults2);
 
             var result = multipleTestResults.GetScenarioResult(scenario);
 
             Check.That(result).IsEqualTo(TestResult.Passed);
         }
 
-        private static Mock<SingleTestRunBase> SetupStubForGetScenarioResult(TestResult resultOfGetFeatureResult)
+        private static SingleTestRunBase SetupStubForGetScenarioResult(TestResult resultOfGetFeatureResult)
         {
-            var testResults1 = new Mock<SingleTestRunBase>();
-            testResults1.Setup(ti => ti.GetScenarioResult(It.IsAny<Scenario>())).Returns(resultOfGetFeatureResult);
+            var testResults1 = Substitute.For<SingleTestRunBase>();
+            testResults1.GetScenarioResult(Arg.Any<Scenario>()).Returns(resultOfGetFeatureResult);
             return testResults1;
         }
 
@@ -182,7 +182,7 @@ public void GetScenarioResult_OnePassingOneFailing_ReturnsFailed()
             var testResults1 = SetupStubForGetScenarioResult(TestResult.Passed);
             var testResults2 = SetupStubForGetScenarioResult(TestResult.Failed);
 
-            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1.Object, testResults2.Object);
+            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1, testResults2);
 
             var result = multipleTestResults.GetScenarioResult(scenario);
 
@@ -197,7 +197,7 @@ public void GetScenarioResult_TwoInconclusive_ReturnsInconclusive()
             var testResults1 = SetupStubForGetScenarioResult(TestResult.Inconclusive);
             var testResults2 = SetupStubForGetScenarioResult(TestResult.Inconclusive);
 
-            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1.Object, testResults2.Object);
+            ITestResults multipleTestResults = CreateMultipleTestResults(testResults1, testResults2);
 
             var result = multipleTestResults.GetScenarioResult(scenario);
 
diff --git a/src/Pickles/Pickles.TestFrameworks.UnitTests/packages.config b/src/Pickles/Pickles.TestFrameworks.UnitTests/packages.config
index 1d481661c..5e52996c1 100644
--- a/src/Pickles/Pickles.TestFrameworks.UnitTests/packages.config
+++ b/src/Pickles/Pickles.TestFrameworks.UnitTests/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
   <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
-  <package id="Moq" version="4.5.30" targetFramework="net45" />
   <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" />
+  <package id="NSubstitute" version="2.0.3" targetFramework="net45" />
+  <package id="NUnit" version="3.7.0" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
+  <package id="System.IO.Abstractions.TestingHelpers" version="2.0.0.143" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.TestFrameworks/Pickles.TestFrameworks.csproj b/src/Pickles/Pickles.TestFrameworks/Pickles.TestFrameworks.csproj
index 9147e13cb..3df866699 100644
--- a/src/Pickles/Pickles.TestFrameworks/Pickles.TestFrameworks.csproj
+++ b/src/Pickles/Pickles.TestFrameworks/Pickles.TestFrameworks.csproj
@@ -30,15 +30,15 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />
diff --git a/src/Pickles/Pickles.TestFrameworks/packages.config b/src/Pickles/Pickles.TestFrameworks/packages.config
index 0c2630e74..4c20967f4 100644
--- a/src/Pickles/Pickles.TestFrameworks/packages.config
+++ b/src/Pickles/Pickles.TestFrameworks/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="System.IO.Abstractions" version="2.0.0.140" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.UserInterface/NLog.xsd b/src/Pickles/Pickles.UserInterface/NLog.xsd
index b1bb9f9d7..6b2604233 100644
--- a/src/Pickles/Pickles.UserInterface/NLog.xsd
+++ b/src/Pickles/Pickles.UserInterface/NLog.xsd
@@ -42,12 +42,32 @@
     </xs:attribute>
     <xs:attribute name="throwExceptions" type="xs:boolean">
       <xs:annotation>
-        <xs:documentation>Pass NLog internal exceptions to the application. Default value is: false.</xs:documentation>
+        <xs:documentation>Throw an exception when there is an internal error. Default value is: false.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="throwConfigExceptions" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Throw an exception when there is a configuration error. If not set, determined by throwExceptions.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="keepVariablesOnReload" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Gets or sets a value indicating whether Variables should be kept on configuration reload. Default value is: false.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="internalLogToTrace" type="xs:boolean">
       <xs:annotation>
-        <xs:documentation>Write internal NLog messages to the the System.Diagnostics.Trace. Default value is: false</xs:documentation>
+        <xs:documentation>Write internal NLog messages to the System.Diagnostics.Trace. Default value is: false.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="internalLogIncludeTimestamp" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Write timestamps for internal NLog messages. Default value is: true.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="useInvariantCulture" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Use InvariantCulture as default culture instead of CurrentCulture.  Default value is: false.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
   </xs:complexType>
@@ -174,7 +194,7 @@
   <xs:complexType name="NLogInclude">
     <xs:attribute name="file" type="SimpleLayoutAttribute" use="required">
       <xs:annotation>
-        <xs:documentation>Name of the file to be included. The name is relative to the name of the current config file.</xs:documentation>
+        <xs:documentation>Name of the file to be included. You could use * wildcard. The name is relative to the name of the current config file.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="ignoreErrors" type="xs:boolean" use="optional" default="false">
@@ -306,6 +326,7 @@
       <xs:extension base="WrapperTargetBase">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="asyncFlush" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="condition" minOccurs="0" maxOccurs="1" type="Condition" />
           <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
@@ -314,6 +335,11 @@
             <xs:documentation>Name of the target.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="asyncFlush" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Delay the flush until the LogEvent has been confirmed as written</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="condition" type="Condition">
           <xs:annotation>
             <xs:documentation>Condition expression. Log events who meet this condition will cause a flush on the wrapped target.</xs:documentation>
@@ -383,13 +409,14 @@
           <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.NLogViewerParameterInfo" />
-          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeCallSite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="appInfo" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="ndcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
@@ -457,9 +484,9 @@
             <xs:documentation>Maximum queue size.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeMdc" type="xs:boolean">
+        <xs:attribute name="includeNdc" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
+            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="includeSourceInfo" type="xs:boolean">
@@ -472,9 +499,9 @@
             <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeNdc" type="xs:boolean">
+        <xs:attribute name="includeMdc" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
+            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="includeCallSite" type="xs:boolean">
@@ -492,6 +519,11 @@
             <xs:documentation>NDC item separator.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="includeMdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
@@ -981,6 +1013,7 @@
           <xs:element name="source" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.EventLogTargetOverflowAction" />
           <xs:element name="entryType" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="maxKilobytes" minOccurs="0" maxOccurs="1" type="xs:long" />
           <xs:element name="maxMessageLength" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
@@ -1029,6 +1062,11 @@
             <xs:documentation>Optional entrytype. When not set, or when not convertable to  then determined by </xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="maxKilobytes" type="xs:long">
+          <xs:annotation>
+            <xs:documentation>Maximum Event log size in kilobytes. If null, the value won't be set. Default is 512 Kilobytes as specified by Eventlog API</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="maxMessageLength" type="xs:integer">
           <xs:annotation>
             <xs:documentation>Message length limit to write to the Event Log.</xs:documentation>
@@ -1327,6 +1365,13 @@
       <xs:enumeration value="Day" />
       <xs:enumeration value="Hour" />
       <xs:enumeration value="Minute" />
+      <xs:enumeration value="Sunday" />
+      <xs:enumeration value="Monday" />
+      <xs:enumeration value="Tuesday" />
+      <xs:enumeration value="Wednesday" />
+      <xs:enumeration value="Thursday" />
+      <xs:enumeration value="Friday" />
+      <xs:enumeration value="Saturday" />
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="NLog.Targets.FilePathKind">
@@ -1560,6 +1605,7 @@
     <xs:choice minOccurs="0" maxOccurs="unbounded">
       <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
       <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="parameterType" minOccurs="0" maxOccurs="1" type="xs:string" />
       <xs:element name="type" minOccurs="0" maxOccurs="1" type="xs:string" />
     </xs:choice>
     <xs:attribute name="layout" type="SimpleLayoutAttribute">
@@ -1572,11 +1618,16 @@
         <xs:documentation>Name of the parameter.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="type" type="xs:string">
+    <xs:attribute name="parameterType" type="xs:string">
       <xs:annotation>
         <xs:documentation>Type of the parameter.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
+    <xs:attribute name="type" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type of the parameter. Obsolete alias for </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
   </xs:complexType>
   <xs:complexType name="Mail">
     <xs:complexContent>
@@ -1993,13 +2044,14 @@
           <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.NLogViewerParameterInfo" />
-          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeCallSite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="appInfo" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="ndcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
@@ -2067,9 +2119,9 @@
             <xs:documentation>Maximum queue size.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeMdc" type="xs:boolean">
+        <xs:attribute name="includeNdc" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
+            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="includeSourceInfo" type="xs:boolean">
@@ -2082,9 +2134,9 @@
             <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeNdc" type="xs:boolean">
+        <xs:attribute name="includeMdc" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
+            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="includeCallSite" type="xs:boolean">
@@ -2102,6 +2154,11 @@
             <xs:documentation>NDC item separator.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="includeMdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
@@ -2650,8 +2707,10 @@
           <xs:element name="attribute" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.JsonAttribute" />
           <xs:element name="excludeProperties" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="renderEmptyObject" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="suppressSpaces" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="excludeProperties" type="xs:string">
           <xs:annotation>
@@ -2663,6 +2722,11 @@
             <xs:documentation>Option to include all properties from the log events</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="includeMdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="renderEmptyObject" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Option to render the empty object value {}</xs:documentation>
@@ -2673,12 +2737,18 @@
             <xs:documentation>Option to suppress the extra spaces in the output json</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="includeMdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
   <xs:complexType name="NLog.Layouts.JsonAttribute">
     <xs:choice minOccurs="0" maxOccurs="unbounded">
       <xs:element name="encode" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="escapeUnicode" minOccurs="0" maxOccurs="1" type="xs:boolean" />
       <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
       <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
     </xs:choice>
@@ -2687,6 +2757,11 @@
         <xs:documentation>Determines wether or not this attribute will be Json encoded.</xs:documentation>
       </xs:annotation>
     </xs:attribute>
+    <xs:attribute name="escapeUnicode" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Indicates whether to escape non-ascii characters</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
     <xs:attribute name="layout" type="SimpleLayoutAttribute">
       <xs:annotation>
         <xs:documentation>Layout that will be rendered as the attribute's value.</xs:documentation>
@@ -2727,7 +2802,26 @@
   <xs:complexType name="Log4JXmlEventLayout">
     <xs:complexContent>
       <xs:extension base="Layout">
-        <xs:choice minOccurs="0" maxOccurs="unbounded" />
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="includeAllProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to include all properties from the log events</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
diff --git a/src/Pickles/Pickles.UserInterface/Pickles.UserInterface.csproj b/src/Pickles/Pickles.UserInterface/Pickles.UserInterface.csproj
index 85856745c..de90fea1f 100644
--- a/src/Pickles/Pickles.UserInterface/Pickles.UserInterface.csproj
+++ b/src/Pickles/Pickles.UserInterface/Pickles.UserInterface.csproj
@@ -45,8 +45,8 @@
     <ApplicationIcon>Pickles.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
@@ -61,15 +61,15 @@
       <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MahApps.Metro, Version=1.4.3.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.4.3\lib\net45\MahApps.Metro.dll</HintPath>
+    <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
+      <HintPath>..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Practices.ServiceLocation">
       <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.2\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.10\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NlogViewer, Version=0.6.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -82,13 +82,13 @@
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.4.3\lib\net45\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>..\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />
diff --git a/src/Pickles/Pickles.UserInterface/packages.config b/src/Pickles/Pickles.UserInterface/packages.config
index d6d467015..7b0e14d21 100644
--- a/src/Pickles/Pickles.UserInterface/packages.config
+++ b/src/Pickles/Pickles.UserInterface/packages.config
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net4" />
-  <package id="MahApps.Metro" version="1.4.3" targetFramework="net45" />
+  <package id="MahApps.Metro" version="1.5.0" targetFramework="net45" />
   <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net45" />
-  <package id="NLog" version="4.4.2" targetFramework="net45" />
-  <package id="NLog.Config" version="4.4.2" targetFramework="net45" />
-  <package id="NLog.Schema" version="4.4.2" targetFramework="net45" />
+  <package id="NLog" version="4.4.10" targetFramework="net45" />
+  <package id="NLog.Config" version="4.4.10" targetFramework="net45" />
+  <package id="NLog.Schema" version="4.4.10" targetFramework="net45" />
   <package id="NlogViewer" version="0.6.0.0" targetFramework="net45" />
   <package id="Ookii.Dialogs" version="1.0" requireReinstallation="true" />
-  <package id="System.IO.Abstractions" version="2.0.0.140" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.sln b/src/Pickles/Pickles.sln
index 93cd82afd..bac7de484 100644
--- a/src/Pickles/Pickles.sln
+++ b/src/Pickles/Pickles.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pickles", "Pickles\Pickles.csproj", "{38BAD6E0-78AB-4AC3-91A8-BF72AF5EE394}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -95,6 +95,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pickles.DocumentationBuilde
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pickles.DocumentationBuilders.Cucumber.UnitTests", "Pickles.DocumentationBuilders.Cucumber.UnitTests\Pickles.DocumentationBuilders.Cucumber.UnitTests.csproj", "{4C0CDA28-8C6A-4F14-B2C6-D1873DE66641}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pickles.CommandLine.UnitTests", "Pickles.CommandLine.UnitTests\Pickles.CommandLine.UnitTests.csproj", "{C708FB0D-E2E0-4BE4-BB64-4373E4A0C8AA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Scripts", "Build Scripts", "{59EDA435-AA15-496C-A0B3-82749BB652E2}"
+	ProjectSection(SolutionItems) = preProject
+		..\..\build.fsx = ..\..\build.fsx
+		..\..\chocolatey.fsx = ..\..\chocolatey.fsx
+		..\..\nuget.fsx = ..\..\nuget.fsx
+		..\..\test.fsx = ..\..\test.fsx
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -189,6 +199,10 @@ Global
 		{4C0CDA28-8C6A-4F14-B2C6-D1873DE66641}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4C0CDA28-8C6A-4F14-B2C6-D1873DE66641}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4C0CDA28-8C6A-4F14-B2C6-D1873DE66641}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C708FB0D-E2E0-4BE4-BB64-4373E4A0C8AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C708FB0D-E2E0-4BE4-BB64-4373E4A0C8AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C708FB0D-E2E0-4BE4-BB64-4373E4A0C8AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C708FB0D-E2E0-4BE4-BB64-4373E4A0C8AA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -200,6 +214,7 @@ Global
 		{F3768CCA-00C2-4280-9F8D-4585B5E214B1} = {4E977674-6919-4F15-A6E3-37BFAC18C7E5}
 		{52414CCC-E080-4FBF-AA3B-7E0117AE3673} = {E1DDC21E-D21E-4B2C-8561-17F630EC8F36}
 		{632BD477-03C9-4CC6-8840-6723DE75652E} = {E1DDC21E-D21E-4B2C-8561-17F630EC8F36}
+		{C708FB0D-E2E0-4BE4-BB64-4373E4A0C8AA} = {4E977674-6919-4F15-A6E3-37BFAC18C7E5}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Pickles.CommandLine\Pickles.CommandLine.csproj
diff --git a/src/Pickles/Pickles.sln.GhostDoc.xml b/src/Pickles/Pickles.sln.GhostDoc.xml
index fab28c848..e4a966b1f 100644
--- a/src/Pickles/Pickles.sln.GhostDoc.xml
+++ b/src/Pickles/Pickles.sln.GhostDoc.xml
@@ -16,6 +16,7 @@
     <OutputPath>.\Help</OutputPath>
     <CleanupOutputPath>true</CleanupOutputPath>
     <HelpFileName>Pickles</HelpFileName>
+    <HelpFileNamingMethod>MemberName</HelpFileNamingMethod>
     <ImageFolderPath />
     <Theme />
     <HtmlFormats>
diff --git a/src/Pickles/Pickles/CommandLinArgumentHelpTexts.cs b/src/Pickles/Pickles/CommandLinArgumentHelpTexts.cs
new file mode 100644
index 000000000..64722d16b
--- /dev/null
+++ b/src/Pickles/Pickles/CommandLinArgumentHelpTexts.cs
@@ -0,0 +1,39 @@
+//  --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="CommandLinArgumentHelpTexts.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 static class CommandLinArgumentHelpTexts
+    {
+        public const string HelpFeatureDir = "directory to start scanning recursively for features";
+        public const string HelpOutputDir = "directory where output files will be placed";
+        public const string HelpSutName = "the name of the system under test";
+        public const string HelpSutVersion = "the version of the system under test";
+        public const string HelpLanguageFeatureFiles = "the language of the feature files";
+        public const string HelpDocumentationFormat = "the format of the output documentation";
+        public const string HelpTestResultsFormat = "the format of the linked test results (nunit|nunit3|xunit|xunit2|mstest |cucumberjson|specrun|vstest)";
+        public const string HelpIncludeExperimentalFeatures = "whether to include experimental features";
+        public const string HelpEnableComments = "whether to enable comments in the output";
+        public const string HelpExcludeTags = "exclude scenarios that match this tag";
+
+        public const string HelpTestResultsFile =
+            "the path to the linked test results file (can be a semicolon-separated list of files)";
+
+    }
+}
\ No newline at end of file
diff --git a/src/Pickles/Pickles/EncodingDetector.cs b/src/Pickles/Pickles/EncodingDetector.cs
new file mode 100644
index 000000000..8cf04dac7
--- /dev/null
+++ b/src/Pickles/Pickles/EncodingDetector.cs
@@ -0,0 +1,38 @@
+using System;
+using System.IO.Abstractions;
+using System.Text;
+
+namespace PicklesDoc.Pickles
+{
+    public class EncodingDetector
+    {
+        private readonly IFileSystem fileSystem;
+
+        public EncodingDetector(IFileSystem fileSystem)
+        {
+            this.fileSystem = fileSystem;
+        }
+
+        public Encoding GetEncoding(string filename)
+        {
+            if (filename == null)
+            {
+                throw new ArgumentNullException();
+            }
+
+            var bom = new byte[4];
+            using (var file = this.fileSystem.FileInfo.FromFileName(filename).OpenRead())
+            {
+                file.Read(bom, 0, 4);
+            }
+
+            // Analyze the BOM
+            if (bom[0] == 0x2b && bom[1] == 0x2f && bom[2] == 0x76) return Encoding.UTF7;
+            if (bom[0] == 0xef && bom[1] == 0xbb && bom[2] == 0xbf) return Encoding.UTF8;
+            if (bom[0] == 0xff && bom[1] == 0xfe) return Encoding.Unicode; //UTF-16LE
+            if (bom[0] == 0xfe && bom[1] == 0xff) return Encoding.BigEndianUnicode; //UTF-16BE
+            if (bom[0] == 0 && bom[1] == 0 && bom[2] == 0xfe && bom[3] == 0xff) return Encoding.UTF32;
+            return Encoding.UTF8;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Pickles/Pickles/FileSystemBasedFeatureParser.cs b/src/Pickles/Pickles/FileSystemBasedFeatureParser.cs
index 76cb61350..be979844a 100644
--- a/src/Pickles/Pickles/FileSystemBasedFeatureParser.cs
+++ b/src/Pickles/Pickles/FileSystemBasedFeatureParser.cs
@@ -19,7 +19,9 @@
 //  --------------------------------------------------------------------------------------------------------------------
 
 using System;
+using System.IO;
 using System.IO.Abstractions;
+using System.Text;
 using PicklesDoc.Pickles.ObjectModel;
 
 namespace PicklesDoc.Pickles
@@ -30,30 +32,39 @@ public class FileSystemBasedFeatureParser
 
         private readonly FeatureParser parser;
 
+        private readonly EncodingDetector encodingDetector;
+
         public FileSystemBasedFeatureParser(FeatureParser parser, IFileSystem fileSystem)
         {
             this.parser = parser;
             this.fileSystem = fileSystem;
+            this.encodingDetector = new EncodingDetector(this.fileSystem);
         }
 
         public Feature Parse(string filename)
         {
             Feature feature = null;
-            using (var reader = this.fileSystem.FileInfo.FromFileName(filename).OpenText())
+            var encoding = this.encodingDetector.GetEncoding(filename);
+            using (var fileStream = this.fileSystem.FileInfo.FromFileName(filename).OpenRead())
             {
-                try
-                {
-                    feature = this.parser.Parse(reader);
-                }
-                catch (FeatureParseException e)
+                using (var specificEncoderReader = new StreamReader(fileStream, encoding))
                 {
-                    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);
-                }
+                    try
+                    {
+                        feature = this.parser.Parse(specificEncoderReader);
+                    }
+                    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);
+                    }
+                    specificEncoderReader.Close();
 
-                reader.Close();
+                }
+                fileStream.Close();
             }
 
             return feature;
diff --git a/src/Pickles/Pickles/Pickles.csproj b/src/Pickles/Pickles/Pickles.csproj
index 43f626912..e66791cc5 100644
--- a/src/Pickles/Pickles/Pickles.csproj
+++ b/src/Pickles/Pickles/Pickles.csproj
@@ -35,12 +35,12 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.6.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.6.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ClosedXML, Version=0.85.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClosedXML.0.85.0\lib\net40\ClosedXML.dll</HintPath>
+    <Reference Include="ClosedXML, Version=0.87.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClosedXML.0.87.1\lib\net40\ClosedXML.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -63,15 +63,12 @@
       <HintPath>..\packages\MarkdownDeep.NET.1.5\lib\.NetFramework 3.5\MarkdownDeep.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NDesk.Options">
-      <HintPath>..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.2\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.4.10\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Strike.Jint">
@@ -80,8 +77,8 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.140\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.144, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.144\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
@@ -94,13 +91,14 @@
     <Compile Include="..\VersionInfo.cs">
       <Link>VersionInfo.cs</Link>
     </Compile>
-    <Compile Include="CommandLineArgumentParser.cs" />
+    <Compile Include="CommandLinArgumentHelpTexts.cs" />
     <Compile Include="Configuration.cs" />
     <Compile Include="ConfigurationReporter.cs" />
     <Compile Include="CultureAwareDialectProvider.cs" />
     <Compile Include="DescriptionProcessor.cs" />
     <Compile Include="DirectoryCrawler\ImageFileDetector.cs" />
     <Compile Include="DirectoryCrawler\ParsingReport.cs" />
+    <Compile Include="EncodingDetector.cs" />
     <Compile Include="Extensions\PathExtensions.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
     <Compile Include="DirectoryCrawler\FeatureNodeFactory.cs" />
diff --git a/src/Pickles/Pickles/packages.config b/src/Pickles/Pickles/packages.config
index 601a3c1e5..8881b7371 100644
--- a/src/Pickles/Pickles/packages.config
+++ b/src/Pickles/Pickles/packages.config
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.3.0" targetFramework="net45" />
-  <package id="ClosedXML" version="0.85.0" targetFramework="net45" />
+  <package id="Autofac" version="4.6.0" targetFramework="net45" />
+  <package id="ClosedXML" version="0.87.1" targetFramework="net45" />
   <package id="DocumentFormat.OpenXml" version="2.5" targetFramework="net45" />
   <package id="FeatureSwitcher" version="1.1.0" targetFramework="net45" />
   <package id="Gherkin" version="4.0.0" targetFramework="net45" />
   <package id="MarkdownDeep.NET" version="1.5" targetFramework="net35" />
   <package id="NDesk.Options" version="0.2.1" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="NLog" version="4.4.2" targetFramework="net45" />
-  <package id="System.IO.Abstractions" version="2.0.0.140" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
+  <package id="NLog" version="4.4.10" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.144" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/VersionInfo.cs b/src/Pickles/VersionInfo.cs
index b66c252c4..e8a61f0c7 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.15.0")]
-[assembly: AssemblyFileVersionAttribute("2.15.0")]
+[assembly: AssemblyVersionAttribute("2.16.0")]
+[assembly: AssemblyFileVersionAttribute("2.16.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.15.0";
-        internal const System.String AssemblyFileVersion = "2.15.0";
+        internal const System.String AssemblyVersion = "2.16.0";
+        internal const System.String AssemblyFileVersion = "2.16.0";
     }
 }
diff --git a/test-harness/AutomationLayer/AdditionSteps.cs b/test-harness/AutomationLayer/AdditionSteps.cs
index fdd3b41e4..869a0c0f8 100644
--- a/test-harness/AutomationLayer/AdditionSteps.cs
+++ b/test-harness/AutomationLayer/AdditionSteps.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Shouldly;
+using NFluent;
 using TechTalk.SpecFlow;
 
 namespace AutomationLayer
@@ -22,13 +22,13 @@ public void GivenTheCalculatorHasCleanMemory()
         [Given(@"the background step fails")]
         public void GivenTheBackgroundStepFails()
         {
-            1.ShouldBe(2);
+            MarkTestAs.Failing();
         }
 
         [Given(@"I have entered (.*) into the calculator")]
-        public void GivenIHaveEnteredIntoTheCalculator(Decimal p0)
+        public void GivenIHaveEnteredIntoTheCalculator(decimal operand)
         {
-            this.numbersList.Add((int)p0);
+            this.numbersList.Add((int)operand);
         }
 
         [When(@"I press add")]
@@ -41,9 +41,9 @@ public void WhenIPressAdd()
         }
 
         [Then(@"the result should be (.*) on the screen")]
-        public void ThenTheResultShouldBeOnTheScreen(int p0)
+        public void ThenTheResultShouldBeOnTheScreen(int expectedResult)
         {
-            this.result.ShouldBe(p0);
+            Check.That(this.result).IsEqualTo(expectedResult);
         }
     }
 }
diff --git a/test-harness/AutomationLayer/AutomationLayer.csproj b/test-harness/AutomationLayer/AutomationLayer.csproj
index 0b47d9889..5b5403876 100644
--- a/test-harness/AutomationLayer/AutomationLayer.csproj
+++ b/test-harness/AutomationLayer/AutomationLayer.csproj
@@ -35,8 +35,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Shouldly, Version=2.8.2.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
-      <HintPath>..\packages\Shouldly.2.8.2\lib\net40\Shouldly.dll</HintPath>
+    <Reference Include="NFluent, Version=1.3.1.0, Culture=neutral, PublicKeyToken=18828b37b84b1437, processorArchitecture=MSIL">
+      <HintPath>..\packages\NFluent.1.3.1.0\lib\net40\NFluent.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -52,6 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdditionSteps.cs" />
+    <Compile Include="MarkTestAs.cs" />
     <Compile Include="MinimalFeatures\MinimalSteps.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ScenarioOutlineSteps.cs" />
diff --git a/test-harness/AutomationLayer/MarkTestAs.cs b/test-harness/AutomationLayer/MarkTestAs.cs
new file mode 100644
index 000000000..e1362542a
--- /dev/null
+++ b/test-harness/AutomationLayer/MarkTestAs.cs
@@ -0,0 +1,23 @@
+using NFluent;
+using TechTalk.SpecFlow;
+
+namespace AutomationLayer
+{
+    public static class MarkTestAs
+    {
+        internal static void Inconclusive()
+        {
+            ScenarioContext.Current.Pending();
+        }
+
+        internal static void Failing()
+        {
+            Check.That(true).IsEqualTo(false);
+        }
+
+        internal static void Passing()
+        {
+            // nothing to be done
+        }
+    }
+}
\ No newline at end of file
diff --git a/test-harness/AutomationLayer/MinimalFeatures/MinimalSteps.cs b/test-harness/AutomationLayer/MinimalFeatures/MinimalSteps.cs
index 2a19c595d..a06608c03 100644
--- a/test-harness/AutomationLayer/MinimalFeatures/MinimalSteps.cs
+++ b/test-harness/AutomationLayer/MinimalFeatures/MinimalSteps.cs
@@ -1,5 +1,4 @@
 using System;
-using Shouldly;
 using TechTalk.SpecFlow;
 
 namespace AutomationLayer.MinimalFeatures
@@ -10,18 +9,19 @@ public class MinimalSteps
         [Then(@"passing step")]
         public void ThenPassingStep()
         {
+            MarkTestAs.Passing();
         }
-        
+
         [Then(@"inconclusive step")]
         public void ThenInconclusiveStep()
         {
-            ScenarioContext.Current.Pending();
+            MarkTestAs.Inconclusive();
         }
-        
+
         [Then(@"failing step")]
         public void ThenFailingStep()
         {
-            true.ShouldBe(false);
+            MarkTestAs.Failing();
         }
     }
 }
diff --git a/test-harness/AutomationLayer/ScenarioOutlineSteps.cs b/test-harness/AutomationLayer/ScenarioOutlineSteps.cs
index 69efd65b3..02f5fa669 100644
--- a/test-harness/AutomationLayer/ScenarioOutlineSteps.cs
+++ b/test-harness/AutomationLayer/ScenarioOutlineSteps.cs
@@ -1,53 +1,51 @@
 using System;
 
-using Shouldly;
-
 using TechTalk.SpecFlow;
 
 namespace AutomationLayer
 {
-  [Binding]
-  public class ScenarioOutlineSteps
-  {
-    [Then(@"the scenario will '(.*)'")]
-    public void ThenTheScenarioWill(string result)
+    [Binding]
+    public class ScenarioOutlineSteps
     {
-        if (result.ToUpperInvariant().StartsWith("PASS"))
+        [Then(@"the scenario will '(.*)'")]
+        public void ThenTheScenarioWill(string result)
         {
-        // nothing to be done
+            if (result.ToUpperInvariant().StartsWith("PASS"))
+            {
+                MarkTestAs.Passing();
+            }
+            else if (result.ToUpperInvariant().StartsWith("FAIL"))
+            {
+                MarkTestAs.Failing();
+            }
+            else
+            {
+                MarkTestAs.Inconclusive();
+            }
         }
-        else if (result.ToUpperInvariant().StartsWith("FAIL"))
+
+        [When(@"I have special characters for regexes in the value, for example a '(.*)'")]
+        public void WhenIHaveSpecialCharactersForRegexesInTheValueForExampleARegex(string regex)
         {
-        true.ShouldBe(false);
+            // nothing to be done
         }
-        else
+
+        [When(@"I have backslashes in the value, for example a '(.*)'")]
+        public void WhenIHaveBackslashesInTheValueForExampleAFilePath(string filePath)
         {
-        ScenarioContext.Current.Pending();
+            // nothing to be done
         }
-    }
 
-    [When(@"I have special characters for regexes in the value, for example a '(.*)'")]
-    public void WhenIHaveSpecialCharactersForRegexesInTheValueForExampleARegex(string regex)
-    {
-        // nothing to be done
-    }    
-
-    [When(@"I have backslashes in the value, for example a '(.*)'")]
-    public void WhenIHaveBackslashesInTheValueForExampleAFilePath(string filePath)
-    {
-        // nothing to be done
-    }
+        [When(@"I have parenthesis in the value, for example an '(.*)'")]
+        public void WhenIHaveParenthesisInTheValueForExampleAnOverlyDescriptiveField(string description)
+        {
+            // nothing to be done - test case requires pass
+        }
 
-    [When(@"I have parenthesis in the value, for example an '(.*)'")]
-    public void WhenIHaveParenthesisInTheValueForExampleAnOverlyDescriptiveField(string description)
-    {
-        // nothing to be done - test case requires pass
-    }
-    
-    [When(@"I have a field with value '(.*)'")]
-    public void WhenIHaveAFieldWithValue(string value)
-    {
-        // nothing to be done - test case requires pass
+        [When(@"I have a field with value '(.*)'")]
+        public void WhenIHaveAFieldWithValue(string value)
+        {
+            // nothing to be done - test case requires pass
+        }
     }
-  }
 }
diff --git a/test-harness/AutomationLayer/packages.config b/test-harness/AutomationLayer/packages.config
index 110dd3a65..80d6da8c6 100644
--- a/test-harness/AutomationLayer/packages.config
+++ b/test-harness/AutomationLayer/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Shouldly" version="2.8.2" targetFramework="net45" />
+  <package id="NFluent" version="1.3.1.0" targetFramework="net45" />
   <package id="SpecFlow" version="1.9.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/test-harness/SpecRun/App.config b/test-harness/SpecRun/App.config
index 521cc9e30..81f33d36a 100644
--- a/test-harness/SpecRun/App.config
+++ b/test-harness/SpecRun/App.config
@@ -13,4 +13,12 @@
           <add name="SpecRun" />
       </plugins>
   </specFlow>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="TechTalk.SpecFlow" publicKeyToken="0778194805d6db41" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.9.0.77" newVersion="1.9.0.77" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
\ No newline at end of file
diff --git a/test-harness/TestHarness.sln.GhostDoc.xml b/test-harness/TestHarness.sln.GhostDoc.xml
index 7380c08f1..79f5bebe1 100644
--- a/test-harness/TestHarness.sln.GhostDoc.xml
+++ b/test-harness/TestHarness.sln.GhostDoc.xml
@@ -16,6 +16,7 @@
     <OutputPath>.\Help</OutputPath>
     <CleanupOutputPath>true</CleanupOutputPath>
     <HelpFileName>TestHarness</HelpFileName>
+    <HelpFileNamingMethod>MemberName</HelpFileNamingMethod>
     <ImageFolderPath />
     <Theme />
     <HtmlFormats>
diff --git a/test.fsx b/test.fsx
index 5bc3994e9..007773c24 100644
--- a/test.fsx
+++ b/test.fsx
@@ -79,6 +79,16 @@ Target "Test.DocumentationBuilders.Word" (fun _ ->
              ToolPath = "packages/NUnit.ConsoleRunner/tools/nunit3-console.exe" })
 )
 
+
+Target "Test.Runners.CommandLine" (fun _ ->
+    !! (testDir + "PicklesDoc.Pickles.CommandLine.UnitTests.dll")
+      |> NUnit3 (fun p ->
+          {p with
+             ShadowCopy = false;
+             OutputDir = testDir + "PicklesDoc.Pickles.CommandLine.UnitTests.TestResults.xml";
+             ToolPath = "packages/NUnit.ConsoleRunner/tools/nunit3-console.exe" })
+)
+
 "Test"
     ==> "Test.DocumentationBuilders.Cucumber"
     ==> "Test.DocumentationBuilders.Dhtml"
@@ -86,6 +96,7 @@ Target "Test.DocumentationBuilders.Word" (fun _ ->
     ==> "Test.DocumentationBuilders.Html"
     ==> "Test.DocumentationBuilders.Json"
     ==> "Test.DocumentationBuilders.Word"
+    ==> "Test.Runners.CommandLine"
     ==> "Test.TestFrameworks"
 
 // start build