diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index b60fb0827..6fcebedbe 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,275 +1 @@
-# Pickles Release Notes
-
-## v2.0.4 - 2015-12-27
-
-### Bug Fixed
-
-- The PowerShell runner does not load ([#239](https://github.com/picklesdoc/pickles/issues/239))
-
-
-## v2.0.3 - 2015-15-23
-
-### Bug Fixed
-
-- The presence of a background causes a crash when integrating test results ([#238](https://github.com/picklesdoc/pickles/issues/238))
-
-
-## v2.0.2 - 2015-11-21
-
-### Bugs Fixed
-
-- Test results in example rows of scenario outlines that contain `$` signs were not correctly identified ([#227](https://github.com/picklesdoc/pickles/issues/227))
-- Table layout in the DHTML version was sometimes unnecessarily narrow ([#225])https://github.com/picklesdoc/pickles/pull/225))
-
-## v2.0.1 - 2015-11-20
-
-### Bug Fixed
-
-- A crash was fixed that occurred when linking nUnit test results  ([#223](https://github.com/picklesdoc/pickles/issues/223))
-
-## v2.0.0 - 2015-11-03
-
-### Breaking Change
-
-- Pickles uses version 3 of the Gherkin parser, and as such requires .NET 4.5. The new parser is a lot smaller and should be faster too.
-
-## v1.2.3 - 2015-10-06
-
-### Bugs Fixed
-
-- In the DHtml version, the alignment of the keywords (Given, When, Then) was fixed for non-English languages ([#219](https://github.com/picklesdoc/pickles/issues/219))
-
-## v1.2.2 - 2015-09-24
-
-### Bugs Fixed
-
-- The PowerShell version now correctly traces relative paths from the current directory ([#216](https://github.com/picklesdoc/pickles/issues/216))
-
-## v1.2.1 - 2015-08-14
-
-### Bugs Fixed
-
-- In the Html version, the alignment of the keywords (Given, When, Then) was fixed for non-English languages ([#209](https://github.com/picklesdoc/pickles/issues/209))
-- A NullReferenceException in the MSTest provider was fixed when the test results also contain ordinary unit test results in addition to the SpecFlow results ([#212](https://github.com/picklesdoc/pickles/issues/212))
-
-## v1.2.0 - 2015-07-28
-
-### New Feature
-
-- In the DHtml version, there are now links to hide/show the navigation, and to collapse/expand all nodes in the navigation ([#204](https://github.com/picklesdoc/pickles/issues/204))
-
-### Bugs Fixed
-
-- The command line version no longer silently fails when an error occurs. You will need to adapt the configuration in order to get more information from the error ([#202]((https://github.com/picklesdoc/pickles/issues/202))
-- The issue of failing silently in case the full filename is too long has been fixed ([#199](https://github.com/picklesdoc/pickles/issues/199))
-
-## v1.1.0 - 2015-05-12
-
-### New Feature
-
-- In both the DHtml and Html versions: Align scenario keywords to the right side so that step texts start from the same position ([#195](https://github.com/picklesdoc/pickles/issues/195))
-
-### Bugs Fixed
-
-- Abbreviations displayed incorrectly with spaces between letters ([#192](https://github.com/picklesdoc/pickles/issues/192))
-
-## v1.0.1 - 2015-03-31
-
-### Bugs Fixed
-
-- In the DHtml version, feature wide tags with capitals can not be filtered on ([#194](https://github.com/picklesdoc/pickles/issues/194))
-- Tables in background for Word & Excel  ([#191](https://github.com/picklesdoc/pickles/issues/191))
-
-## v1.0.0 - 2014-12-15
-
-### Breaking Change
-
-- Support for the nAnt runner has been discontinued. nAnt users can migrate by using nAnt's capabilities to call the command line runner of Pickles. ([#179](https://github.com/picklesdoc/pickles/pull/179))
-
-### Bug Fix
-
-- The checkmark/cross icon in the GUI client did not always show the cross icon when appropriate, and its state could be changed by the user. ([#177](https://github.com/picklesdoc/pickles/pull/177))
-
-## v0.20.0 - 2014-12-10
-
-### Breaking Change
-
-- The msbuild runner will now break the build when an error occurs. This reflects our belief that the Living Documentation is a first class output of the software development process.
-
-### New Features
-
-- The command line and powershell runners now return an error code of 0 when everything went fine, and 1 if there was an error.
-- The HTML and DHTML output versions no longer horizontally spread tables.
-- The GUI version has an icon
-
-## v0.19.0 - 2014-11-25
-
-### Breaking Change
-
-- DITA support has been discontinued. ([#153](https://github.com/picklesdoc/pickles/pull/153))
-
-### New Features
-
-- Each runner has its own download package
-- Several improvements to the DHTML version
-  - A progress indicator when loading features for the first time
-  - Add a toggle to show/hide folder contents (top level folders are collapsed by default)
-- The Nuget package for the MSBuild runner adds an msbuild target file - see [MSBuild Task](http://www.picklesdoc.com/#!Pages/MSBuildTask.md) for documentation ([#157](https://github.com/picklesdoc/pickles/pull/157))
-- The text "pickled on" was replaced with "generated on".
-
-### For developers
-
-We are now using a new assert library: [NFluent](http://n-fluent.net/).
-
-## v0.18.2 - 2014-09-12
-
-### Bug(s) Fixed
-
-- Fixed issue where the Html version didn't render the pass/fail icons ([#139](https://github.com/picklesdoc/pickles/issues/139))
-- Fixed issue where the Html version generated an unexpected entry for a file in obj/Debug ([#140](https://github.com/picklesdoc/pickles/issues/140))
-- Removed dependencies from the Nuget packages ([#142](https://github.com/picklesdoc/pickles/issues/142))
-- The nuget packages Pickles.CommandLine and Pickles.MSBuild contain the files twice ([#144](https://github.com/picklesdoc/pickles/issues/144))
-
-## v0.18.1 - 2014-09-01
-
-### Bug(s) Fixed
-
-- Fixed issue where multiline arguments of gherkin steps would not be rendered in the DHtml verion ([#134](https://github.com/picklesdoc/pickles/issues/134))
-
-## v0.18.0 - 2014-07-07
-
-### New Feature(s)
-
-- **Potential Breaking Change**: the folder structure of the dependencies of the static HTML version was changed. If you override the .css files, you will need to update your workflow to account for that.
-
-### Bug(s) Fixed
-
-- Fixed issue where multiple results files for a single feature causes exceptions when processing scenario outline examples ([#123](https://github.com/picklesdoc/pickles/pull/123))
-- Fixed issue where pickles would crash when a specified test results file does not exist ([#126](https://github.com/picklesdoc/pickles/issues/126))
-
-## v0.17.4 - 2014-06-04
-
-### Bug(s) Fixed
-
-- Description blocks are rendered as code elements in DHtml version ([#118](https://github.com/picklesdoc/pickles/issues/118))
-
-## v0.17.3 - 2014-05-28
-
-### Bug(s) Fixed
-
-- PowerShell version works again
-
-## v0.17.2 - 2014-05-28
-
-Some things went wrong during the publication of versions 0.17.0 and 0.17.1. Therefore 0.17.2 is the first published 0.17.x version.
-
-### New Feature(s)
-
-- Added test status in the DHTML browsing section (left nav) (#110)
-
-### Bug(s) Fixed
-
-- Crash because of nunit result (#108)
-- Avoid crash on start of GUI (#112)
-
-## v0.16.0 - 2014-05-15
-
-### New Feature(s)
-
-- Enable results for individual example results in a scenario outline (in the Html version) ([#105](https://github.com/picklesdoc/pickles/pull/105))
-
-### Bug Fixed
-
-- Features don't render correctly when there are less than 4 spaces ([#106](https://github.com/picklesdoc/pickles/pull/106))
-
-## v0.15.0 - 2014-04-11
-
-### New Feature(s)
-
-- Allow multiple result files ([#83](https://github.com/picklesdoc/pickles/issues/83)): it is now possible to use multiple test result files. This will come in handy if you need to partition your test runs. Simple use a semicolon-separated list of file paths instead of the single file path as an argument
-
-## v0.14.0 - 2014-03-27
-
-### New Feature(s)
-
-- The (static) Html version now supports images with .png, .gif, .jpg and .bmp extensions. This partially addresses issue ([#12](https://github.com/picklesdoc/pickles/issues/12))
-- Several updates of external dependencies, including the long out-of-date IKVM. Yay!
-- All production code and test code now use the excellent [System.IO.Abstraction](https://github.com/tathamoddie/System.IO.Abstractions) library and its TestingHelpers classes.
-- We are using build services provided by [MyGet](http://www.myget.org/)
-
-## v0.13.1 - 2013-12-20
-
-### Bug(s) Fixed
-
-- DHTML uses the Feature's description for the Background ([#74](https://github.com/picklesdoc/pickles/issues/74))
-- Nuget manifest should mention PicklesDoc instead of only Jeffrey Cameron ([#84](https://github.com/picklesdoc/pickles/issues/84))
-- Crash when a feature is not present in the test result (with NUnit) ([#85](https://github.com/picklesdoc/pickles/issues/85))
-
-## v0.13.0 - 2013-11-29
-
-### New Feature(s)
-
-- The UI version now includes the option to generate each selected output format in its own directory ([#78](https://github.com/picklesdoc/pickles/pull/78))
-
-### Bug(s) Fixed
-
-- Left nav bug fix in DHTML format ([#73](https://github.com/picklesdoc/pickles/pull/73))
-- DHTML uses the Feature's description for the Background ([#74](https://github.com/picklesdoc/pickles/issues/74))
-
-
-## v0.12.1 - 2013-10-28
-
-### Bug(s) Fixed
-
-- Fixes a .NET runtime version issue caused by combining all Pickles runners in one directory. We are back to each runner in a separate directory, and will likely remain so until all assemblies use the same .NET framework version.
-
-## v0.12 - 2013-10-25
-
-### New Feature(s)
-
-- DHTML output format should render Markdown correctly (one step closer toward feature parity for all export formats) ([#60](https://github.com/picklesdoc/pickles/issues/60))
-- The .zip file contains all 5 Pickles runners in one directory, reducing the size of the download by roughly three quarters.
-
-### Bug(s) Fixed
-
-- When selecting multiple output formats in the UI, pickles generates the first output format multiple times ([#66](https://github.com/picklesdoc/pickles/issues/66))
-
-## v0.11 - 2013-09-26
-
-### New Feature(s)
-
-- Better Error Reporting: both the command line client and the UI show a log ([#36](https://github.com/picklesdoc/pickles/issues/36))
-
-### Bug(s) Fixed
-
-- Pickles crashes when generating excel with really long descriptions ([#62](https://github.com/picklesdoc/pickles/issues/62))
-- Calling pickles.exe without any arguments in a directory without features causes a crash ([#63](https://github.com/picklesdoc/pickles/issues/63))
-
-## v0.10 - 2013-08-29
-
-### New Feature(s)
-
-- Add support for SpecRun test results ([#21](https://github.com/picklesdoc/pickles/issues/21)). Refer to the wiki page for instructions on how to configure SpecRun correctly: [Integrating Test Results From SpecRun](http://www.picklesdoc.com/#!Pages/IntegratingTestResultsFromSpecRun.md).
-
-### Bug(s) Fixed
-
-- Please implement marking ignored test cases with yellow sign rather than red for all Test Result providers (not just MSTest) ([#47](https://github.com/picklesdoc/pickles/issues/47))
-- Remove duplication of example feature files ([#50](https://github.com/picklesdoc/pickles/issues/50))
-- Adding background to features in word ([#58](https://github.com/picklesdoc/pickles/pull/58))
-- Handle cucumber feature with no scenarios ([#59](https://github.com/picklesdoc/pickles/pull/59))
-
-
-## Older Releases without Release Notes
-
-- v0.9 - 2013-07-23
-- v0.8 - 2012-12-17
-- v0.7 - 2012-08-07
-- v0.6 was skipped
-- v0.5 - 2012-03-13
-- v0.4 - 2012-01-20
-- v0.3 - 2011-12-13
-- v0.2 - 2011-11-14
-- v0.1 - 2011-10-22
-
-
-
+# Pickles Release Notes

## v2.1.0 - 2015-12-30

### New Feature

- The language of the `.feature` files can now be set in the MSBuild runner as well. See MSBuild configuration should map Language too ([#236](https://github.com/picklesdoc/pickles/issues/236)).

### Bug Fixed

- Remove potential load failure from the Command Line, GUI and MSBuild runners ([#243](https://github.com/picklesdoc/pickles/issues/243))

### Other

- Some external components were updated.

## v2.0.4 - 2015-12-27

### Bug Fixed

- The PowerShell runner does not load ([#239](https://github.com/picklesdoc/pickles/issues/239))


## v2.0.3 - 2015-15-23

### Bug Fixed

- The presence of a background causes a crash when integrating test results ([#238](https://github.com/picklesdoc/pickles/issues/238))


## v2.0.2 - 2015-11-21

### Bugs Fixed

- Test results in example rows of scenario outlines that contain `$` signs were not correctly identified ([#227](https://github.com/picklesdoc/pickles/issues/227))
- Table layout in the DHTML version was sometimes unnecessarily narrow ([#225])https://github.com/picklesdoc/pickles/pull/225))

## v2.0.1 - 2015-11-20

### Bug Fixed

- A crash was fixed that occurred when linking nUnit test results  ([#223](https://github.com/picklesdoc/pickles/issues/223))

## v2.0.0 - 2015-11-03

### Breaking Change

- Pickles uses version 3 of the Gherkin parser, and as such requires .NET 4.5. The new parser is a lot smaller and should be faster too.

## v1.2.3 - 2015-10-06

### Bugs Fixed

- In the DHtml version, the alignment of the keywords (Given, When, Then) was fixed for non-English languages ([#219](https://github.com/picklesdoc/pickles/issues/219))

## v1.2.2 - 2015-09-24

### Bugs Fixed

- The PowerShell version now correctly traces relative paths from the current directory ([#216](https://github.com/picklesdoc/pickles/issues/216))

## v1.2.1 - 2015-08-14

### Bugs Fixed

- In the Html version, the alignment of the keywords (Given, When, Then) was fixed for non-English languages ([#209](https://github.com/picklesdoc/pickles/issues/209))
- A NullReferenceException in the MSTest provider was fixed when the test results also contain ordinary unit test results in addition to the SpecFlow results ([#212](https://github.com/picklesdoc/pickles/issues/212))

## v1.2.0 - 2015-07-28

### New Feature

- In the DHtml version, there are now links to hide/show the navigation, and to collapse/expand all nodes in the navigation ([#204](https://github.com/picklesdoc/pickles/issues/204))

### Bugs Fixed

- The command line version no longer silently fails when an error occurs. You will need to adapt the configuration in order to get more information from the error ([#202]((https://github.com/picklesdoc/pickles/issues/202))
- The issue of failing silently in case the full filename is too long has been fixed ([#199](https://github.com/picklesdoc/pickles/issues/199))

## v1.1.0 - 2015-05-12

### New Feature

- In both the DHtml and Html versions: Align scenario keywords to the right side so that step texts start from the same position ([#195](https://github.com/picklesdoc/pickles/issues/195))

### Bugs Fixed

- Abbreviations displayed incorrectly with spaces between letters ([#192](https://github.com/picklesdoc/pickles/issues/192))

## v1.0.1 - 2015-03-31

### Bugs Fixed

- In the DHtml version, feature wide tags with capitals can not be filtered on ([#194](https://github.com/picklesdoc/pickles/issues/194))
- Tables in background for Word & Excel  ([#191](https://github.com/picklesdoc/pickles/issues/191))

## v1.0.0 - 2014-12-15

### Breaking Change

- Support for the nAnt runner has been discontinued. nAnt users can migrate by using nAnt's capabilities to call the command line runner of Pickles. ([#179](https://github.com/picklesdoc/pickles/pull/179))

### Bug Fix

- The checkmark/cross icon in the GUI client did not always show the cross icon when appropriate, and its state could be changed by the user. ([#177](https://github.com/picklesdoc/pickles/pull/177))

## v0.20.0 - 2014-12-10

### Breaking Change

- The msbuild runner will now break the build when an error occurs. This reflects our belief that the Living Documentation is a first class output of the software development process.

### New Features

- The command line and powershell runners now return an error code of 0 when everything went fine, and 1 if there was an error.
- The HTML and DHTML output versions no longer horizontally spread tables.
- The GUI version has an icon

## v0.19.0 - 2014-11-25

### Breaking Change

- DITA support has been discontinued. ([#153](https://github.com/picklesdoc/pickles/pull/153))

### New Features

- Each runner has its own download package
- Several improvements to the DHTML version
  - A progress indicator when loading features for the first time
  - Add a toggle to show/hide folder contents (top level folders are collapsed by default)
- The Nuget package for the MSBuild runner adds an msbuild target file - see [MSBuild Task](http://www.picklesdoc.com/#!Pages/MSBuildTask.md) for documentation ([#157](https://github.com/picklesdoc/pickles/pull/157))
- The text "pickled on" was replaced with "generated on".

### For developers

We are now using a new assert library: [NFluent](http://n-fluent.net/).

## v0.18.2 - 2014-09-12

### Bug(s) Fixed

- Fixed issue where the Html version didn't render the pass/fail icons ([#139](https://github.com/picklesdoc/pickles/issues/139))
- Fixed issue where the Html version generated an unexpected entry for a file in obj/Debug ([#140](https://github.com/picklesdoc/pickles/issues/140))
- Removed dependencies from the Nuget packages ([#142](https://github.com/picklesdoc/pickles/issues/142))
- The nuget packages Pickles.CommandLine and Pickles.MSBuild contain the files twice ([#144](https://github.com/picklesdoc/pickles/issues/144))

## v0.18.1 - 2014-09-01

### Bug(s) Fixed

- Fixed issue where multiline arguments of gherkin steps would not be rendered in the DHtml verion ([#134](https://github.com/picklesdoc/pickles/issues/134))

## v0.18.0 - 2014-07-07

### New Feature(s)

- **Potential Breaking Change**: the folder structure of the dependencies of the static HTML version was changed. If you override the .css files, you will need to update your workflow to account for that.

### Bug(s) Fixed

- Fixed issue where multiple results files for a single feature causes exceptions when processing scenario outline examples ([#123](https://github.com/picklesdoc/pickles/pull/123))
- Fixed issue where pickles would crash when a specified test results file does not exist ([#126](https://github.com/picklesdoc/pickles/issues/126))

## v0.17.4 - 2014-06-04

### Bug(s) Fixed

- Description blocks are rendered as code elements in DHtml version ([#118](https://github.com/picklesdoc/pickles/issues/118))

## v0.17.3 - 2014-05-28

### Bug(s) Fixed

- PowerShell version works again

## v0.17.2 - 2014-05-28

Some things went wrong during the publication of versions 0.17.0 and 0.17.1. Therefore 0.17.2 is the first published 0.17.x version.

### New Feature(s)

- Added test status in the DHTML browsing section (left nav) (#110)

### Bug(s) Fixed

- Crash because of nunit result (#108)
- Avoid crash on start of GUI (#112)

## v0.16.0 - 2014-05-15

### New Feature(s)

- Enable results for individual example results in a scenario outline (in the Html version) ([#105](https://github.com/picklesdoc/pickles/pull/105))

### Bug Fixed

- Features don't render correctly when there are less than 4 spaces ([#106](https://github.com/picklesdoc/pickles/pull/106))

## v0.15.0 - 2014-04-11

### New Feature(s)

- Allow multiple result files ([#83](https://github.com/picklesdoc/pickles/issues/83)): it is now possible to use multiple test result files. This will come in handy if you need to partition your test runs. Simple use a semicolon-separated list of file paths instead of the single file path as an argument

## v0.14.0 - 2014-03-27

### New Feature(s)

- The (static) Html version now supports images with .png, .gif, .jpg and .bmp extensions. This partially addresses issue ([#12](https://github.com/picklesdoc/pickles/issues/12))
- Several updates of external dependencies, including the long out-of-date IKVM. Yay!
- All production code and test code now use the excellent [System.IO.Abstraction](https://github.com/tathamoddie/System.IO.Abstractions) library and its TestingHelpers classes.
- We are using build services provided by [MyGet](http://www.myget.org/)

## v0.13.1 - 2013-12-20

### Bug(s) Fixed

- DHTML uses the Feature's description for the Background ([#74](https://github.com/picklesdoc/pickles/issues/74))
- Nuget manifest should mention PicklesDoc instead of only Jeffrey Cameron ([#84](https://github.com/picklesdoc/pickles/issues/84))
- Crash when a feature is not present in the test result (with NUnit) ([#85](https://github.com/picklesdoc/pickles/issues/85))

## v0.13.0 - 2013-11-29

### New Feature(s)

- The UI version now includes the option to generate each selected output format in its own directory ([#78](https://github.com/picklesdoc/pickles/pull/78))

### Bug(s) Fixed

- Left nav bug fix in DHTML format ([#73](https://github.com/picklesdoc/pickles/pull/73))
- DHTML uses the Feature's description for the Background ([#74](https://github.com/picklesdoc/pickles/issues/74))


## v0.12.1 - 2013-10-28

### Bug(s) Fixed

- Fixes a .NET runtime version issue caused by combining all Pickles runners in one directory. We are back to each runner in a separate directory, and will likely remain so until all assemblies use the same .NET framework version.

## v0.12 - 2013-10-25

### New Feature(s)

- DHTML output format should render Markdown correctly (one step closer toward feature parity for all export formats) ([#60](https://github.com/picklesdoc/pickles/issues/60))
- The .zip file contains all 5 Pickles runners in one directory, reducing the size of the download by roughly three quarters.

### Bug(s) Fixed

- When selecting multiple output formats in the UI, pickles generates the first output format multiple times ([#66](https://github.com/picklesdoc/pickles/issues/66))

## v0.11 - 2013-09-26

### New Feature(s)

- Better Error Reporting: both the command line client and the UI show a log ([#36](https://github.com/picklesdoc/pickles/issues/36))

### Bug(s) Fixed

- Pickles crashes when generating excel with really long descriptions ([#62](https://github.com/picklesdoc/pickles/issues/62))
- Calling pickles.exe without any arguments in a directory without features causes a crash ([#63](https://github.com/picklesdoc/pickles/issues/63))

## v0.10 - 2013-08-29

### New Feature(s)

- Add support for SpecRun test results ([#21](https://github.com/picklesdoc/pickles/issues/21)). Refer to the wiki page for instructions on how to configure SpecRun correctly: [Integrating Test Results From SpecRun](http://www.picklesdoc.com/#!Pages/IntegratingTestResultsFromSpecRun.md).

### Bug(s) Fixed

- Please implement marking ignored test cases with yellow sign rather than red for all Test Result providers (not just MSTest) ([#47](https://github.com/picklesdoc/pickles/issues/47))
- Remove duplication of example feature files ([#50](https://github.com/picklesdoc/pickles/issues/50))
- Adding background to features in word ([#58](https://github.com/picklesdoc/pickles/pull/58))
- Handle cucumber feature with no scenarios ([#59](https://github.com/picklesdoc/pickles/pull/59))


## Older Releases without Release Notes

- v0.9 - 2013-07-23
- v0.8 - 2012-12-17
- v0.7 - 2012-08-07
- v0.6 was skipped
- v0.5 - 2012-03-13
- v0.4 - 2012-01-20
- v0.3 - 2011-12-13
- v0.2 - 2011-11-14
- v0.1 - 2011-10-22




\ No newline at end of file
diff --git a/build.bat b/build.bat
index dccdf91d3..7e38a3930 100644
--- a/build.bat
+++ b/build.bat
@@ -1,5 +1,5 @@
 @echo off
-set "picklesVersion=2.0.4"
+set "picklesVersion=2.1.0"
 
 cls
 
diff --git a/chocolatey.fsx b/chocolatey.fsx
index 08df1a3f3..4c09a9e26 100644
--- a/chocolatey.fsx
+++ b/chocolatey.fsx
@@ -18,7 +18,22 @@ Target "Clean" (fun _ ->
 
 
 Target "CreatePackage CMD" (fun _ ->
-    CopyFiles packagingDir [cmdDir + "Pickles.exe"; cmdDir + "NLog.config"]
+    CopyFiles packagingDir [
+        cmdDir + "Autofac.dll";
+        cmdDir + "AutoMapper.dll";
+        cmdDir + "ClosedXML.dll";
+        cmdDir + "DocumentFormat.OpenXml.dll";
+        cmdDir + "Gherkin.dll";
+        cmdDir + "MarkdownDeep.dll";
+        cmdDir + "NDesk.Options.dll";
+        cmdDir + "Newtonsoft.Json.dll";
+        cmdDir + "NGenerics.dll";
+        cmdDir + "NLog.dll";
+        cmdDir + "PicklesDoc.Pickles.Library.dll";
+        cmdDir + "System.IO.Abstractions.dll";
+        cmdDir + "pickles.exe";
+        cmdDir + "NLog.config" ]
+
     WriteFile (packagingDir + "version.ps1") [("$version = \"" + version + "\"")]
     NuGet (fun p ->
         {p with
@@ -31,7 +46,31 @@ Target "CreatePackage CMD" (fun _ ->
 
 
 Target "CreatePackage GUI" (fun _ ->
-    CopyFiles packagingDir [guiDir + "picklesui.exe"; guiDir + "NLog.config"; guiDir + "PicklesUI.exe.config"]
+    CopyFiles packagingDir [
+        guiDir + "Autofac.dll";
+        guiDir + "AutoMapper.dll";
+        guiDir + "ClosedXML.dll";
+        guiDir + "DocumentFormat.OpenXml.dll";
+        guiDir + "GalaSoft.MvvmLight.dll";
+        guiDir + "GalaSoft.MvvmLight.Extras.dll";
+        guiDir + "GalaSoft.MvvmLight.Platform.dll";
+        guiDir + "Gherkin.dll";
+        guiDir + "MahApps.Metro.dll";
+        guiDir + "MarkdownDeep.dll";
+        guiDir + "Microsoft.Practices.ServiceLocation.dll";
+        guiDir + "NDesk.Options.dll";
+        guiDir + "Newtonsoft.Json.dll";
+        guiDir + "NGenerics.dll";
+        guiDir + "NLog.dll";
+        guiDir + "NlogViewer.dll";
+        guiDir + "Ookii.Dialogs.Wpf.dll";
+        guiDir + "PicklesDoc.Pickles.Library.dll";
+        guiDir + "System.IO.Abstractions.dll";
+        guiDir + "System.Windows.Interactivity.dll";
+        guiDir + "picklesui.exe";
+        guiDir + "NLog.config";
+        guiDir + "PicklesUI.exe.config"]
+
     WriteFile (packagingDir + "version.ps1") [("$version = \"" + version + "\"")]
     WriteFile (packagingDir + "picklesui.exe.gui") [("")]
     NuGet (fun p ->
diff --git a/chocolatey/pickles.nuspec b/chocolatey/pickles.nuspec
index 6d781ad5f..9b75b61bc 100644
--- a/chocolatey/pickles.nuspec
+++ b/chocolatey/pickles.nuspec
@@ -35,6 +35,18 @@ Optionally, *Pickles* can **integrate test results**, so that your stakeholders
         <iconUrl>https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg</iconUrl>
     </metadata>
     <files>
+        <file src="Autofac.dll" target="tools" />
+        <file src="AutoMapper.dll" target="tools" />
+        <file src="ClosedXML.dll" target="tools" />
+        <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="NGenerics.dll" target="tools" />
+        <file src="NLog.dll" target="tools" />
+        <file src="PicklesDoc.Pickles.Library.dll" target="tools" />
+        <file src="System.IO.Abstractions.dll" target="tools" />
         <file src="pickles.exe" target="tools" />
     </files>
 </package>
diff --git a/chocolatey/picklesui.nuspec b/chocolatey/picklesui.nuspec
index 0bd9207a8..c3c9b67f8 100644
--- a/chocolatey/picklesui.nuspec
+++ b/chocolatey/picklesui.nuspec
@@ -35,6 +35,26 @@ Optionally, *Pickles* can **integrate test results**, so that your stakeholders
         <iconUrl>https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg</iconUrl>
     </metadata>
     <files>
+        <file src="Autofac.dll" target="tools" />
+        <file src="AutoMapper.dll" target="tools" />
+        <file src="ClosedXML.dll" target="tools" />
+        <file src="DocumentFormat.OpenXml.dll" target="tools" />
+        <file src="GalaSoft.MvvmLight.dll" target="tools" />
+        <file src="GalaSoft.MvvmLight.Extras.dll" target="tools" />
+        <file src="GalaSoft.MvvmLight.Platform.dll" target="tools" />
+        <file src="Gherkin.dll" target="tools" />
+        <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="NGenerics.dll" target="tools" />
+        <file src="NLog.dll" target="tools" />
+        <file src="NlogViewer.dll" target="tools" />
+        <file src="Ookii.Dialogs.Wpf.dll" target="tools" />
+        <file src="PicklesDoc.Pickles.Library.dll" target="tools" />
+        <file src="System.IO.Abstractions.dll" target="tools" />
+        <file src="System.Windows.Interactivity.dll" target="tools" />
         <file src="picklesui.exe" target="tools" />
         <file src="picklesui.exe.gui" target="tools" />
         <file src="NLog.config" target="tools" />
diff --git a/nuget.fsx b/nuget.fsx
index 41d079043..755417c7c 100644
--- a/nuget.fsx
+++ b/nuget.fsx
@@ -20,27 +20,55 @@ Target "Clean" (fun _ ->
 
 Target "CreatePackageCommandLine" (fun _ ->
     // Copy all the package files into a package folder
-    CopyFiles packagingDir [cmdDir + "pickles.exe"; cmdDir + "NLog.config" ]
+    CopyFiles packagingDir [
+        cmdDir + "Autofac.dll";
+        cmdDir + "AutoMapper.dll";
+        cmdDir + "ClosedXML.dll";
+        cmdDir + "DocumentFormat.OpenXml.dll";
+        cmdDir + "Gherkin.dll";
+        cmdDir + "MarkdownDeep.dll";
+        cmdDir + "NDesk.Options.dll";
+        cmdDir + "Newtonsoft.Json.dll";
+        cmdDir + "NGenerics.dll";
+        cmdDir + "NLog.dll";
+        cmdDir + "PicklesDoc.Pickles.Library.dll";
+        cmdDir + "System.IO.Abstractions.dll";
+        cmdDir + "pickles.exe";
+        cmdDir + "NLog.config" ]
 
-    NuGet (fun p -> 
+    NuGet (fun p ->
         {p with
             OutputPath = deployDir
             WorkingDir = packagingDir
             Version = version
-            Publish = false }) 
+            Publish = false })
             "src/Pickles/Pickles.CommandLine/Pickles.CommandLine.nuspec"
 )
 
 Target "CreatePackageMsBuild" (fun _ ->
     // Copy all the package files into a package folder
-    CopyFiles packagingDir [msBuildDir + "PicklesDoc.Pickles.MSBuild.Tasks.dll"; msBuildDir + "build/Pickles.MSBuild.targets";]
+    CopyFiles packagingDir [
+        msBuildDir + "Autofac.dll";
+        msBuildDir + "AutoMapper.dll";
+        msBuildDir + "ClosedXML.dll";
+        msBuildDir + "DocumentFormat.OpenXml.dll";
+        msBuildDir + "Gherkin.dll";
+        msBuildDir + "MarkdownDeep.dll";
+        msBuildDir + "NDesk.Options.dll";
+        msBuildDir + "Newtonsoft.Json.dll";
+        msBuildDir + "NGenerics.dll";
+        msBuildDir + "NLog.dll";
+        msBuildDir + "PicklesDoc.Pickles.Library.dll";
+        msBuildDir + "System.IO.Abstractions.dll";
+        msBuildDir + "PicklesDoc.Pickles.MSBuild.Tasks.dll";
+        msBuildDir + "build/Pickles.MSBuild.targets";]
 
-    NuGet (fun p -> 
+    NuGet (fun p ->
         {p with
             OutputPath = deployDir
             WorkingDir = packagingDir
             Version = version
-            Publish = false }) 
+            Publish = false })
             "src/Pickles/Pickles.MSBuild/Pickles.MSBuild.nuspec"
 )
 
@@ -62,16 +90,16 @@ Target "CreatePackagePowerShell" (fun _ ->
         powerShellDir + "System.IO.Abstractions.dll";
         "src/Pickles/Pickles.PowerShell/init.ps1"  ]
 
-    NuGet (fun p -> 
+    NuGet (fun p ->
         {p with
             OutputPath = deployDir
             WorkingDir = packagingDir
             Version = version
-            Publish = false }) 
+            Publish = false })
             "src/Pickles/Pickles.PowerShell/Pickles.nuspec"
 )
 
-Target "CreatePackage" (fun _ -> 
+Target "CreatePackage" (fun _ ->
     trace ("Starting build of nuget packages version " + version)
     DeleteDir packagingDir
 )
diff --git a/src/Pickles/.vs/config/applicationhost.config b/src/Pickles/.vs/config/applicationhost.config
index 5ac001ad4..d3533d23c 100644
--- a/src/Pickles/.vs/config/applicationhost.config
+++ b/src/Pickles/.vs/config/applicationhost.config
@@ -163,7 +163,7 @@
             </site>
             <site name="Pickles.BaseDhtmlFiles" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="C:\Dev\Code\GitHub\DirkRombauts\pickles\src\Pickles\Pickles.BaseDhtmlFiles" />
+                    <virtualDirectory path="/" physicalPath="C:\Dev\Code\GitHub\PicklesDoc\pickles\src\Pickles\Pickles.BaseDhtmlFiles" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:52000:localhost" />
diff --git a/src/Pickles/Pickles.CommandLine/FodyWeavers.xml b/src/Pickles/Pickles.CommandLine/FodyWeavers.xml
deleted file mode 100644
index 57f8fd940..000000000
--- a/src/Pickles/Pickles.CommandLine/FodyWeavers.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-	<Costura />
-</Weavers>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.CommandLine/NLog.xsd b/src/Pickles/Pickles.CommandLine/NLog.xsd
index f942370ca..0ed97b6b2 100644
--- a/src/Pickles/Pickles.CommandLine/NLog.xsd
+++ b/src/Pickles/Pickles.CommandLine/NLog.xsd
@@ -366,18 +366,20 @@
           <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="maxMessageSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="newLine" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="onConnectionOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetConnectionsOverflowAction" />
           <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetOverflowAction" />
+          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="connectionCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="ndcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.NLogViewerParameterInfo" />
+          <xs:element name="includeNdc" 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="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
@@ -405,24 +407,34 @@
             <xs:documentation>Indicates whether to append newline at the end of log message.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="onConnectionOverflow" type="NLog.Targets.NetworkTargetConnectionsOverflowAction">
+          <xs:annotation>
+            <xs:documentation>Action that should be taken if the will be more connections than .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="onOverflow" type="NLog.Targets.NetworkTargetOverflowAction">
           <xs:annotation>
             <xs:documentation>Action that should be taken if the message is larger than maxMessageSize.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="keepConnection" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="connectionCacheSize" type="xs:integer">
           <xs:annotation>
             <xs:documentation>Size of the connection cache (number of connections which are kept alive).</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="address" type="SimpleLayoutAttribute">
+        <xs:attribute name="maxConnections" type="xs:integer">
           <xs:annotation>
-            <xs:documentation>Network address.</xs:documentation>
+            <xs:documentation>Maximum current connections. 0 = no maximum.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="keepConnection" type="xs:boolean">
+        <xs:attribute name="address" type="SimpleLayoutAttribute">
           <xs:annotation>
-            <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
+            <xs:documentation>Network address.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="maxQueueSize" type="xs:integer">
@@ -430,11 +442,6 @@
             <xs:documentation>Maximum queue size.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeNLogData" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
         <xs:attribute name="includeSourceInfo" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Indicates whether to include source info (file name and line number) in the information sent over the network.</xs:documentation>
@@ -445,6 +452,11 @@
             <xs:documentation>NDC item separator.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="includeNdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="includeCallSite" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Indicates whether to include call site (class and method name) in the information sent over the network.</xs:documentation>
@@ -455,9 +467,9 @@
             <xs:documentation>AppInfo field. By default it's the friendly name of the current AppDomain.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeNdc" type="xs:boolean">
+        <xs:attribute name="includeNLogData" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
+            <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="includeMdc" type="xs:boolean">
@@ -468,6 +480,13 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  <xs:simpleType name="NLog.Targets.NetworkTargetConnectionsOverflowAction">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="AllowNewConnnection" />
+      <xs:enumeration value="DiscardMessage" />
+      <xs:enumeration value="Block" />
+    </xs:restriction>
+  </xs:simpleType>
   <xs:simpleType name="NLog.Targets.NetworkTargetOverflowAction">
     <xs:restriction base="xs:string">
       <xs:enumeration value="Error" />
@@ -683,6 +702,7 @@
           <xs:element name="dbProvider" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="dbUserName" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="useTransactions" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="installConnectionString" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="install-command" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseCommandInfo" />
           <xs:element name="uninstall-command" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseCommandInfo" />
@@ -735,6 +755,11 @@
             <xs:documentation>Indicates whether to keep the database connection open between the log events.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="useTransactions" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Obsolete - value will be ignored! The logging code always runs outside of transaction. Gets or sets a value indicating whether to use database transactions. Some data providers require this.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="installConnectionString" type="SimpleLayoutAttribute">
           <xs:annotation>
             <xs:documentation>Connection string using for installation and uninstallation. If not provided, regular ConnectionString is being used.</xs:documentation>
@@ -1645,10 +1670,12 @@
           <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="maxMessageSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="newLine" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="onConnectionOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetConnectionsOverflowAction" />
           <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetOverflowAction" />
           <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="connectionCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
@@ -1676,6 +1703,11 @@
             <xs:documentation>Indicates whether to append newline at the end of log message.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="onConnectionOverflow" type="NLog.Targets.NetworkTargetConnectionsOverflowAction">
+          <xs:annotation>
+            <xs:documentation>Action that should be taken if the will be more connections than .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="onOverflow" type="NLog.Targets.NetworkTargetOverflowAction">
           <xs:annotation>
             <xs:documentation>Action that should be taken if the message is larger than maxMessageSize.</xs:documentation>
@@ -1696,6 +1728,11 @@
             <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="maxConnections" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum current connections. 0 = no maximum.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="maxQueueSize" type="xs:integer">
           <xs:annotation>
             <xs:documentation>Maximum queue size.</xs:documentation>
@@ -1713,18 +1750,20 @@
           <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="maxMessageSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="newLine" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="onConnectionOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetConnectionsOverflowAction" />
           <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetOverflowAction" />
+          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="connectionCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="ndcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.NLogViewerParameterInfo" />
+          <xs:element name="includeNdc" 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="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
@@ -1752,24 +1791,34 @@
             <xs:documentation>Indicates whether to append newline at the end of log message.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="onConnectionOverflow" type="NLog.Targets.NetworkTargetConnectionsOverflowAction">
+          <xs:annotation>
+            <xs:documentation>Action that should be taken if the will be more connections than .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="onOverflow" type="NLog.Targets.NetworkTargetOverflowAction">
           <xs:annotation>
             <xs:documentation>Action that should be taken if the message is larger than maxMessageSize.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="keepConnection" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="connectionCacheSize" type="xs:integer">
           <xs:annotation>
             <xs:documentation>Size of the connection cache (number of connections which are kept alive).</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="address" type="SimpleLayoutAttribute">
+        <xs:attribute name="maxConnections" type="xs:integer">
           <xs:annotation>
-            <xs:documentation>Network address.</xs:documentation>
+            <xs:documentation>Maximum current connections. 0 = no maximum.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="keepConnection" type="xs:boolean">
+        <xs:attribute name="address" type="SimpleLayoutAttribute">
           <xs:annotation>
-            <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
+            <xs:documentation>Network address.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="maxQueueSize" type="xs:integer">
@@ -1777,11 +1826,6 @@
             <xs:documentation>Maximum queue size.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeNLogData" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
         <xs:attribute name="includeSourceInfo" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Indicates whether to include source info (file name and line number) in the information sent over the network.</xs:documentation>
@@ -1792,6 +1836,11 @@
             <xs:documentation>NDC item separator.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="includeNdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="includeCallSite" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Indicates whether to include call site (class and method name) in the information sent over the network.</xs:documentation>
@@ -1802,9 +1851,9 @@
             <xs:documentation>AppInfo field. By default it's the friendly name of the current AppDomain.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeNdc" type="xs:boolean">
+        <xs:attribute name="includeNLogData" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
+            <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="includeMdc" type="xs:boolean">
diff --git a/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.csproj b/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.csproj
index e8a2bada0..4539f2a3c 100644
--- a/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.csproj
+++ b/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.csproj
@@ -50,13 +50,13 @@
       <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.2.0\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.2.3\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.117, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.117\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.123, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.123\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
@@ -78,9 +78,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="FodyWeavers.xml">
-      <SubType>Designer</SubType>
-    </Content>
     <Content Include="NLog.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -94,49 +91,6 @@
     <None Include="Settings.StyleCop" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Fody.1.29.3\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.3\build\dotnet\Fody.targets'))" />
-  </Target>
-  <!--<UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
-    <ParameterGroup>
-      <Config Output="false" Required="true" ParameterType="Microsoft.Build.Framework.ITaskItem" />
-      <Files Output="false" Required="true" ParameterType="Microsoft.Build.Framework.ITaskItem[]" />
-    </ParameterGroup>
-    <Task Evaluate="true">
-      <Reference xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Include="System.Xml" />
-      <Reference xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Include="System.Xml.Linq" />
-      <Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System" />
-      <Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System.IO" />
-      <Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System.Xml.Linq" />
-      <Code xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Type="Fragment" Language="cs"><![CDATA[
-var config = XElement.Load(Config.ItemSpec).Elements("Costura").FirstOrDefault();
-
-if (config == null) return true;
-
-var excludedAssemblies = new List<string>();
-var attribute = config.Attribute("ExcludeAssemblies");
-if (attribute != null)
-    foreach (var item in attribute.Value.Split('|').Select(x => x.Trim()).Where(x => x != string.Empty))
-        excludedAssemblies.Add(item);
-var element = config.Element("ExcludeAssemblies");
-if (element != null)
-    foreach (var item in element.Value.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).Where(x => x != string.Empty))
-        excludedAssemblies.Add(item);
-
-var filesToCleanup = Files.Select(f => f.ItemSpec).Where(f => !excludedAssemblies.Contains(Path.GetFileNameWithoutExtension(f), StringComparer.InvariantCultureIgnoreCase));
-
-foreach (var item in filesToCleanup)
-  File.Delete(item);
-]]></Code>
-    </Task>
-  </UsingTask>
-  <Target Name="CleanReferenceCopyLocalPaths" AfterTargets="AfterBuild;NonWinFodyTarget">
-    <CosturaCleanup Config="FodyWeavers.xml" Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
-  </Target>-->
   <!-- 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">
diff --git a/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.nuspec b/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.nuspec
index 79716d7e6..2bba94210 100644
--- a/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.nuspec
+++ b/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.nuspec
@@ -36,6 +36,18 @@
     <iconUrl>https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg</iconUrl>
   </metadata>
   <files>
+    <file src="Autofac.dll" target="tools" />
+    <file src="AutoMapper.dll" target="tools" />
+    <file src="ClosedXML.dll" target="tools" />
+    <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="NGenerics.dll" target="tools" />
+    <file src="NLog.dll" target="tools" />
+    <file src="PicklesDoc.Pickles.Library.dll" target="tools" />
+    <file src="System.IO.Abstractions.dll" target="tools" />
     <file src="Pickles.exe" target="tools" />
     <file src="NLog.config" target="tools" />
   </files>
diff --git a/src/Pickles/Pickles.CommandLine/packages.config b/src/Pickles/Pickles.CommandLine/packages.config
index 83b9f1add..e268c73df 100644
--- a/src/Pickles/Pickles.CommandLine/packages.config
+++ b/src/Pickles/Pickles.CommandLine/packages.config
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autofac" version="3.5.2" targetFramework="net45" />
-  <package id="Costura.Fody" version="1.3.5.0" targetFramework="net45" developmentDependency="true" />
-  <package id="Fody" version="1.29.3" targetFramework="net45" developmentDependency="true" />
   <package id="NDesk.Options" version="0.2.1" />
-  <package id="NLog" version="4.2.0" targetFramework="net45" />
-  <package id="NLog.Config" version="4.2.0" targetFramework="net45" />
-  <package id="NLog.Schema" version="4.2.0" targetFramework="net45" />
-  <package id="System.IO.Abstractions" version="2.0.0.117" targetFramework="net45" />
+  <package id="NLog" version="4.2.3" targetFramework="net45" />
+  <package id="NLog.Config" version="4.2.3" targetFramework="net45" />
+  <package id="NLog.Schema" version="4.2.1" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.123" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.MSBuild/FodyWeavers.xml b/src/Pickles/Pickles.MSBuild/FodyWeavers.xml
deleted file mode 100644
index 2e6d4a7ab..000000000
--- a/src/Pickles/Pickles.MSBuild/FodyWeavers.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-	<Costura/>
-  
-</Weavers>
\ 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 92add63a1..d8233236e 100644
--- a/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.csproj
+++ b/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.csproj
@@ -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.117, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.117\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.123, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.123\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
@@ -76,53 +76,7 @@
     <None Include="packages.config" />
     <None Include="Settings.StyleCop" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="FodyWeavers.xml" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Fody.1.29.3\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.3\build\dotnet\Fody.targets'))" />
-  </Target>
-  <!--<UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
-    <ParameterGroup>
-      <Config Output="false" Required="true" ParameterType="Microsoft.Build.Framework.ITaskItem" />
-      <Files Output="false" Required="true" ParameterType="Microsoft.Build.Framework.ITaskItem[]" />
-    </ParameterGroup>
-    <Task Evaluate="true">
-      <Reference xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Include="System.Xml" />
-      <Reference xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Include="System.Xml.Linq" />
-      <Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System" />
-      <Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System.IO" />
-      <Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System.Xml.Linq" />
-      <Code xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Type="Fragment" Language="cs"><![CDATA[
-var config = XElement.Load(Config.ItemSpec).Elements("Costura").FirstOrDefault();
-
-if (config == null) return true;
-
-var excludedAssemblies = new List<string>();
-var attribute = config.Attribute("ExcludeAssemblies");
-if (attribute != null)
-    foreach (var item in attribute.Value.Split('|').Select(x => x.Trim()).Where(x => x != string.Empty))
-        excludedAssemblies.Add(item);
-var element = config.Element("ExcludeAssemblies");
-if (element != null)
-    foreach (var item in element.Value.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).Where(x => x != string.Empty))
-        excludedAssemblies.Add(item);
-
-var filesToCleanup = Files.Select(f => f.ItemSpec).Where(f => !excludedAssemblies.Contains(Path.GetFileNameWithoutExtension(f), StringComparer.InvariantCultureIgnoreCase));
-
-foreach (var item in filesToCleanup)
-  File.Delete(item);
-]]></Code>
-    </Task>
-  </UsingTask>
-  <Target Name="CleanReferenceCopyLocalPaths" AfterTargets="AfterBuild;NonWinFodyTarget">
-    <CosturaCleanup Config="FodyWeavers.xml" Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
-  </Target>-->
   <!-- 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">
diff --git a/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.nuspec b/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.nuspec
index f9c4d2d98..08b95a59a 100644
--- a/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.nuspec
+++ b/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.nuspec
@@ -36,7 +36,19 @@
     <iconUrl>https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg</iconUrl>
   </metadata>
   <files>
+    <file src="Autofac.dll" target="tools" />
+    <file src="AutoMapper.dll" target="tools" />
+    <file src="ClosedXML.dll" target="tools" />
+    <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="NGenerics.dll" target="tools" />
+    <file src="NLog.dll" target="tools" />
+    <file src="PicklesDoc.Pickles.Library.dll" target="tools" />
     <file src="PicklesDoc.Pickles.MSBuild.Tasks.dll" target="tools" />
+    <file src="System.IO.Abstractions.dll" target="tools" />
     <file src="Pickles.MSBuild.targets" target="build" />
   </files>
 </package>
diff --git a/src/Pickles/Pickles.MSBuild/build/Pickles.MSBuild.targets b/src/Pickles/Pickles.MSBuild/build/Pickles.MSBuild.targets
index 6caa5b4c5..c1cb25a87 100644
--- a/src/Pickles/Pickles.MSBuild/build/Pickles.MSBuild.targets
+++ b/src/Pickles/Pickles.MSBuild/build/Pickles.MSBuild.targets
@@ -1,21 +1,22 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\tools\PicklesDoc.Pickles.MSBuild.Tasks.dll" TaskName="Pickles" />
-	<Target Name="DocumentationGeneration" AfterTargets="Build" Condition=" '$(Pickles_Generate)' == 'True' ">
-		<PropertyGroup>
-			<Pickles_OutputDirectory Condition=" '$(Pickles_OutputDirectory)' == '' ">$(MSBuildProjectDirectory)\pickles-site</Pickles_OutputDirectory>
-			<Pickles_FeatureDirectory Condition=" '$(Pickles_FeatureDirectory)' == '' ">$(MSBuildProjectDirectory)\Features</Pickles_FeatureDirectory>
-		</PropertyGroup>	
+    <UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\tools\PicklesDoc.Pickles.MSBuild.Tasks.dll" TaskName="Pickles" />
+    <Target Name="DocumentationGeneration" AfterTargets="Build" Condition=" '$(Pickles_Generate)' == 'True' ">
+        <PropertyGroup>
+            <Pickles_OutputDirectory Condition=" '$(Pickles_OutputDirectory)' == '' ">$(MSBuildProjectDirectory)\pickles-site</Pickles_OutputDirectory>
+            <Pickles_FeatureDirectory Condition=" '$(Pickles_FeatureDirectory)' == '' ">$(MSBuildProjectDirectory)\Features</Pickles_FeatureDirectory>
+        </PropertyGroup>
 
-		<RemoveDir Directories="$(Pickles_OutputDirectory)" />
-		<MakeDir Directories="$(Pickles_OutputDirectory)" />
+        <RemoveDir Directories="$(Pickles_OutputDirectory)" />
+        <MakeDir Directories="$(Pickles_OutputDirectory)" />
 
-		<Pickles 
-			FeatureDirectory="$(Pickles_FeatureDirectory)" 
-			OutputDirectory="$(Pickles_OutputDirectory)" 
-			ResultsFormat="$(Pickles_ResultsFormat)"
-			ResultsFile="$(Pickles_ResultsFile)"
-			SystemUnderTestName="$(Pickles_SystemUnderTestName)"
-			SystemUnderTestVersion="$(Pickles_SystemUnderTestVersion)"			
-			DocumentationFormat="$(Pickles_DocumentationFormat)" />
-	</Target>
+        <Pickles
+            FeatureDirectory="$(Pickles_FeatureDirectory)"
+            OutputDirectory="$(Pickles_OutputDirectory)"
+            ResultsFormat="$(Pickles_ResultsFormat)"
+            ResultsFile="$(Pickles_ResultsFile)"
+            SystemUnderTestName="$(Pickles_SystemUnderTestName)"
+            SystemUnderTestVersion="$(Pickles_SystemUnderTestVersion)"
+            DocumentationFormat="$(Pickles_DocumentationFormat)"
+            Language="$(Pickles_Language)" />
+    </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.MSBuild/packages.config b/src/Pickles/Pickles.MSBuild/packages.config
index 949663bde..130d810d6 100644
--- a/src/Pickles/Pickles.MSBuild/packages.config
+++ b/src/Pickles/Pickles.MSBuild/packages.config
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autofac" version="3.5.2" targetFramework="net45" />
-  <package id="Costura.Fody" version="1.3.5.0" targetFramework="net45" developmentDependency="true" />
-  <package id="Fody" version="1.29.3" targetFramework="net45" developmentDependency="true" />
-  <package id="System.IO.Abstractions" version="2.0.0.117" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.123" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.PowerShell/Pickles.PowerShell.csproj b/src/Pickles/Pickles.PowerShell/Pickles.PowerShell.csproj
index 92b379a7a..1b8a40c39 100644
--- a/src/Pickles/Pickles.PowerShell/Pickles.PowerShell.csproj
+++ b/src/Pickles/Pickles.PowerShell/Pickles.PowerShell.csproj
@@ -43,8 +43,8 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.117, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.117\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.123, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.123\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Management" />
@@ -73,42 +73,6 @@
     <None Include="Settings.StyleCop" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!--<UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
-    <ParameterGroup>
-      <Config Output="false" Required="true" ParameterType="Microsoft.Build.Framework.ITaskItem" />
-      <Files Output="false" Required="true" ParameterType="Microsoft.Build.Framework.ITaskItem[]" />
-    </ParameterGroup>
-    <Task Evaluate="true">
-      <Reference xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Include="System.Xml" />
-      <Reference xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Include="System.Xml.Linq" />
-      <Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System" />
-      <Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System.IO" />
-      <Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System.Xml.Linq" />
-      <Code xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Type="Fragment" Language="cs"><![CDATA[
-var config = XElement.Load(Config.ItemSpec).Elements("Costura").FirstOrDefault();
-
-if (config == null) return true;
-
-var excludedAssemblies = new List<string>();
-var attribute = config.Attribute("ExcludeAssemblies");
-if (attribute != null)
-    foreach (var item in attribute.Value.Split('|').Select(x => x.Trim()).Where(x => x != string.Empty))
-        excludedAssemblies.Add(item);
-var element = config.Element("ExcludeAssemblies");
-if (element != null)
-    foreach (var item in element.Value.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).Where(x => x != string.Empty))
-        excludedAssemblies.Add(item);
-
-var filesToCleanup = Files.Select(f => f.ItemSpec).Where(f => !excludedAssemblies.Contains(Path.GetFileNameWithoutExtension(f), StringComparer.InvariantCultureIgnoreCase));
-
-foreach (var item in filesToCleanup)
-  File.Delete(item);
-]]></Code>
-    </Task>
-  </UsingTask>
-  <Target Name="CleanReferenceCopyLocalPaths" AfterTargets="AfterBuild;NonWinFodyTarget">
-    <CosturaCleanup Config="FodyWeavers.xml" Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
-  </Target>-->
   <!-- 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">
diff --git a/src/Pickles/Pickles.PowerShell/packages.config b/src/Pickles/Pickles.PowerShell/packages.config
index 7458d0e49..130d810d6 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="3.5.2" targetFramework="net45" />
-  <package id="System.IO.Abstractions" version="2.0.0.117" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.123" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.Test/App.config b/src/Pickles/Pickles.Test/App.config
index 37bdc1177..162597a63 100644
--- a/src/Pickles/Pickles.Test/App.config
+++ b/src/Pickles/Pickles.Test/App.config
@@ -15,7 +15,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.IO.Abstractions" publicKeyToken="d480b5b72fb413da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.117" newVersion="2.0.0.117" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.123" newVersion="2.0.0.123" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="IKVM.OpenJDK.Text" publicKeyToken="13235d27fcbfff58" culture="neutral" />
diff --git a/src/Pickles/Pickles.Test/Pickles.Test.csproj b/src/Pickles/Pickles.Test/Pickles.Test.csproj
index 78ca23978..b1692fad3 100644
--- a/src/Pickles/Pickles.Test/Pickles.Test.csproj
+++ b/src/Pickles/Pickles.Test/Pickles.Test.csproj
@@ -74,12 +74,12 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.117, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.117\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.123, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.123\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.IO.Abstractions.TestingHelpers, Version=2.0.0.117, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.TestingHelpers.2.0.0.117\lib\net40\System.IO.Abstractions.TestingHelpers.dll</HintPath>
+    <Reference Include="System.IO.Abstractions.TestingHelpers, Version=2.0.0.123, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.TestingHelpers.2.0.0.123\lib\net40\System.IO.Abstractions.TestingHelpers.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
diff --git a/src/Pickles/Pickles.Test/packages.config b/src/Pickles/Pickles.Test/packages.config
index a7778ffde..b524815f9 100644
--- a/src/Pickles/Pickles.Test/packages.config
+++ b/src/Pickles/Pickles.Test/packages.config
@@ -10,6 +10,6 @@
   <package id="NGenerics" version="1.4.1.0" targetFramework="net35" />
   <package id="NUnit" version="2.6.4" targetFramework="net35" />
   <package id="SpecFlow" version="1.9.0" targetFramework="net35" />
-  <package id="System.IO.Abstractions" version="2.0.0.117" targetFramework="net45" />
-  <package id="System.IO.Abstractions.TestingHelpers" version="2.0.0.117" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.123" targetFramework="net45" />
+  <package id="System.IO.Abstractions.TestingHelpers" version="2.0.0.123" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.UserInterface/FodyWeavers.xml b/src/Pickles/Pickles.UserInterface/FodyWeavers.xml
deleted file mode 100644
index 2e6d4a7ab..000000000
--- a/src/Pickles/Pickles.UserInterface/FodyWeavers.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-	<Costura/>
-  
-</Weavers>
\ No newline at end of file
diff --git a/src/Pickles/Pickles.UserInterface/NLog.xsd b/src/Pickles/Pickles.UserInterface/NLog.xsd
index f942370ca..0ed97b6b2 100644
--- a/src/Pickles/Pickles.UserInterface/NLog.xsd
+++ b/src/Pickles/Pickles.UserInterface/NLog.xsd
@@ -366,18 +366,20 @@
           <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="maxMessageSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="newLine" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="onConnectionOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetConnectionsOverflowAction" />
           <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetOverflowAction" />
+          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="connectionCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="ndcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.NLogViewerParameterInfo" />
+          <xs:element name="includeNdc" 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="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
@@ -405,24 +407,34 @@
             <xs:documentation>Indicates whether to append newline at the end of log message.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="onConnectionOverflow" type="NLog.Targets.NetworkTargetConnectionsOverflowAction">
+          <xs:annotation>
+            <xs:documentation>Action that should be taken if the will be more connections than .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="onOverflow" type="NLog.Targets.NetworkTargetOverflowAction">
           <xs:annotation>
             <xs:documentation>Action that should be taken if the message is larger than maxMessageSize.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="keepConnection" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="connectionCacheSize" type="xs:integer">
           <xs:annotation>
             <xs:documentation>Size of the connection cache (number of connections which are kept alive).</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="address" type="SimpleLayoutAttribute">
+        <xs:attribute name="maxConnections" type="xs:integer">
           <xs:annotation>
-            <xs:documentation>Network address.</xs:documentation>
+            <xs:documentation>Maximum current connections. 0 = no maximum.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="keepConnection" type="xs:boolean">
+        <xs:attribute name="address" type="SimpleLayoutAttribute">
           <xs:annotation>
-            <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
+            <xs:documentation>Network address.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="maxQueueSize" type="xs:integer">
@@ -430,11 +442,6 @@
             <xs:documentation>Maximum queue size.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeNLogData" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
         <xs:attribute name="includeSourceInfo" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Indicates whether to include source info (file name and line number) in the information sent over the network.</xs:documentation>
@@ -445,6 +452,11 @@
             <xs:documentation>NDC item separator.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="includeNdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="includeCallSite" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Indicates whether to include call site (class and method name) in the information sent over the network.</xs:documentation>
@@ -455,9 +467,9 @@
             <xs:documentation>AppInfo field. By default it's the friendly name of the current AppDomain.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeNdc" type="xs:boolean">
+        <xs:attribute name="includeNLogData" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
+            <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="includeMdc" type="xs:boolean">
@@ -468,6 +480,13 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  <xs:simpleType name="NLog.Targets.NetworkTargetConnectionsOverflowAction">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="AllowNewConnnection" />
+      <xs:enumeration value="DiscardMessage" />
+      <xs:enumeration value="Block" />
+    </xs:restriction>
+  </xs:simpleType>
   <xs:simpleType name="NLog.Targets.NetworkTargetOverflowAction">
     <xs:restriction base="xs:string">
       <xs:enumeration value="Error" />
@@ -683,6 +702,7 @@
           <xs:element name="dbProvider" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="dbUserName" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="useTransactions" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="installConnectionString" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="install-command" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseCommandInfo" />
           <xs:element name="uninstall-command" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseCommandInfo" />
@@ -735,6 +755,11 @@
             <xs:documentation>Indicates whether to keep the database connection open between the log events.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="useTransactions" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Obsolete - value will be ignored! The logging code always runs outside of transaction. Gets or sets a value indicating whether to use database transactions. Some data providers require this.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="installConnectionString" type="SimpleLayoutAttribute">
           <xs:annotation>
             <xs:documentation>Connection string using for installation and uninstallation. If not provided, regular ConnectionString is being used.</xs:documentation>
@@ -1645,10 +1670,12 @@
           <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="maxMessageSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="newLine" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="onConnectionOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetConnectionsOverflowAction" />
           <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetOverflowAction" />
           <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="connectionCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
@@ -1676,6 +1703,11 @@
             <xs:documentation>Indicates whether to append newline at the end of log message.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="onConnectionOverflow" type="NLog.Targets.NetworkTargetConnectionsOverflowAction">
+          <xs:annotation>
+            <xs:documentation>Action that should be taken if the will be more connections than .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="onOverflow" type="NLog.Targets.NetworkTargetOverflowAction">
           <xs:annotation>
             <xs:documentation>Action that should be taken if the message is larger than maxMessageSize.</xs:documentation>
@@ -1696,6 +1728,11 @@
             <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="maxConnections" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum current connections. 0 = no maximum.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="maxQueueSize" type="xs:integer">
           <xs:annotation>
             <xs:documentation>Maximum queue size.</xs:documentation>
@@ -1713,18 +1750,20 @@
           <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
           <xs:element name="maxMessageSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="newLine" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="onConnectionOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetConnectionsOverflowAction" />
           <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetOverflowAction" />
+          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="connectionCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
           <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="ndcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
           <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.NLogViewerParameterInfo" />
+          <xs:element name="includeNdc" 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="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
           <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
         </xs:choice>
         <xs:attribute name="name" type="xs:string">
@@ -1752,24 +1791,34 @@
             <xs:documentation>Indicates whether to append newline at the end of log message.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="onConnectionOverflow" type="NLog.Targets.NetworkTargetConnectionsOverflowAction">
+          <xs:annotation>
+            <xs:documentation>Action that should be taken if the will be more connections than .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="onOverflow" type="NLog.Targets.NetworkTargetOverflowAction">
           <xs:annotation>
             <xs:documentation>Action that should be taken if the message is larger than maxMessageSize.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="keepConnection" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="connectionCacheSize" type="xs:integer">
           <xs:annotation>
             <xs:documentation>Size of the connection cache (number of connections which are kept alive).</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="address" type="SimpleLayoutAttribute">
+        <xs:attribute name="maxConnections" type="xs:integer">
           <xs:annotation>
-            <xs:documentation>Network address.</xs:documentation>
+            <xs:documentation>Maximum current connections. 0 = no maximum.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="keepConnection" type="xs:boolean">
+        <xs:attribute name="address" type="SimpleLayoutAttribute">
           <xs:annotation>
-            <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
+            <xs:documentation>Network address.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="maxQueueSize" type="xs:integer">
@@ -1777,11 +1826,6 @@
             <xs:documentation>Maximum queue size.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeNLogData" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
         <xs:attribute name="includeSourceInfo" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Indicates whether to include source info (file name and line number) in the information sent over the network.</xs:documentation>
@@ -1792,6 +1836,11 @@
             <xs:documentation>NDC item separator.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="includeNdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="includeCallSite" type="xs:boolean">
           <xs:annotation>
             <xs:documentation>Indicates whether to include call site (class and method name) in the information sent over the network.</xs:documentation>
@@ -1802,9 +1851,9 @@
             <xs:documentation>AppInfo field. By default it's the friendly name of the current AppDomain.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="includeNdc" type="xs:boolean">
+        <xs:attribute name="includeNLogData" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
+            <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
           </xs:annotation>
         </xs:attribute>
         <xs:attribute name="includeMdc" type="xs:boolean">
diff --git a/src/Pickles/Pickles.UserInterface/Pickles.UserInterface.csproj b/src/Pickles/Pickles.UserInterface/Pickles.UserInterface.csproj
index dab00a1a6..2db1282b9 100644
--- a/src/Pickles/Pickles.UserInterface/Pickles.UserInterface.csproj
+++ b/src/Pickles/Pickles.UserInterface/Pickles.UserInterface.csproj
@@ -68,7 +68,7 @@
       <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.2.0\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NlogViewer, Version=0.6.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -81,8 +81,8 @@
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
-    <Reference Include="System.IO.Abstractions, Version=2.0.0.117, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.117\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.123, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.123\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
@@ -158,10 +158,9 @@
     <None Include="app.config">
       <SubType>Designer</SubType>
     </None>
-    <Resource Include="FodyWeavers.xml" />
-    <None Include="NLog.config">
+    <Content Include="NLog.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    </Content>
     <None Include="NLog.xsd">
       <SubType>Designer</SubType>
     </None>
@@ -176,49 +175,6 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Fody.1.29.3\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.3\build\dotnet\Fody.targets'))" />
-  </Target>
-  <!--<UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
-    <ParameterGroup>
-      <Config Output="false" Required="true" ParameterType="Microsoft.Build.Framework.ITaskItem" />
-      <Files Output="false" Required="true" ParameterType="Microsoft.Build.Framework.ITaskItem[]" />
-    </ParameterGroup>
-    <Task Evaluate="true">
-      <Reference xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Include="System.Xml" />
-      <Reference xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Include="System.Xml.Linq" />
-      <Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System" />
-      <Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System.IO" />
-      <Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System.Xml.Linq" />
-      <Code xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Type="Fragment" Language="cs"><![CDATA[
-var config = XElement.Load(Config.ItemSpec).Elements("Costura").FirstOrDefault();
-
-if (config == null) return true;
-
-var excludedAssemblies = new List<string>();
-var attribute = config.Attribute("ExcludeAssemblies");
-if (attribute != null)
-    foreach (var item in attribute.Value.Split('|').Select(x => x.Trim()).Where(x => x != string.Empty))
-        excludedAssemblies.Add(item);
-var element = config.Element("ExcludeAssemblies");
-if (element != null)
-    foreach (var item in element.Value.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).Where(x => x != string.Empty))
-        excludedAssemblies.Add(item);
-
-var filesToCleanup = Files.Select(f => f.ItemSpec).Where(f => !excludedAssemblies.Contains(Path.GetFileNameWithoutExtension(f), StringComparer.InvariantCultureIgnoreCase));
-
-foreach (var item in filesToCleanup)
-  File.Delete(item);
-]]></Code>
-    </Task>
-  </UsingTask>
-  <Target Name="CleanReferenceCopyLocalPaths" AfterTargets="AfterBuild;NonWinFodyTarget">
-    <CosturaCleanup Config="FodyWeavers.xml" Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
-  </Target>-->
   <!-- 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">
diff --git a/src/Pickles/Pickles.UserInterface/packages.config b/src/Pickles/Pickles.UserInterface/packages.config
index c854e60f4..244620498 100644
--- a/src/Pickles/Pickles.UserInterface/packages.config
+++ b/src/Pickles/Pickles.UserInterface/packages.config
@@ -2,14 +2,12 @@
 <packages>
   <package id="Autofac" version="3.5.2" targetFramework="net4" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net4" />
-  <package id="Costura.Fody" version="1.3.5.0" targetFramework="net45" developmentDependency="true" />
-  <package id="Fody" version="1.29.3" targetFramework="net45" developmentDependency="true" />
   <package id="MahApps.Metro" version="1.1.2.0" targetFramework="net45" />
   <package id="MvvmLightLibs" version="5.2.0.0" targetFramework="net45" />
-  <package id="NLog" version="4.2.0" targetFramework="net45" />
-  <package id="NLog.Config" version="4.2.0" targetFramework="net45" />
-  <package id="NLog.Schema" version="4.2.0" targetFramework="net45" />
+  <package id="NLog" version="4.2.3" targetFramework="net45" />
+  <package id="NLog.Config" version="4.2.3" targetFramework="net45" />
+  <package id="NLog.Schema" version="4.2.1" 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.117" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.123" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/Pickles/Pickles.csproj b/src/Pickles/Pickles/Pickles.csproj
index 6a13e70a1..be1c5fb1e 100644
--- a/src/Pickles/Pickles/Pickles.csproj
+++ b/src/Pickles/Pickles/Pickles.csproj
@@ -72,14 +72,14 @@
       <HintPath>..\packages\NGenerics.1.4.1.0\lib\net35\NGenerics.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.2.0\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.2.3\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.117, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Abstractions.2.0.0.117\lib\net40\System.IO.Abstractions.dll</HintPath>
+    <Reference Include="System.IO.Abstractions, Version=2.0.0.123, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Abstractions.2.0.0.123\lib\net40\System.IO.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
diff --git a/src/Pickles/Pickles/packages.config b/src/Pickles/Pickles/packages.config
index 1e5e5845d..93c283537 100644
--- a/src/Pickles/Pickles/packages.config
+++ b/src/Pickles/Pickles/packages.config
@@ -9,6 +9,6 @@
   <package id="NDesk.Options" version="0.2.1" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
   <package id="NGenerics" version="1.4.1.0" targetFramework="net35" />
-  <package id="NLog" version="4.2.0" targetFramework="net45" />
-  <package id="System.IO.Abstractions" version="2.0.0.117" targetFramework="net45" />
+  <package id="NLog" version="4.2.3" targetFramework="net45" />
+  <package id="System.IO.Abstractions" version="2.0.0.123" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Pickles/VersionInfo.cs b/src/Pickles/VersionInfo.cs
index ea954d936..aed8763e3 100644
--- a/src/Pickles/VersionInfo.cs
+++ b/src/Pickles/VersionInfo.cs
@@ -8,10 +8,10 @@
 [assembly: AssemblyTrademarkAttribute("")]
 [assembly: AssemblyCultureAttribute("")]
 [assembly: ComVisibleAttribute(false)]
-[assembly: AssemblyVersionAttribute("2.0.4")]
-[assembly: AssemblyFileVersionAttribute("2.0.4")]
+[assembly: AssemblyVersionAttribute("2.1.0")]
+[assembly: AssemblyFileVersionAttribute("2.1.0")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.0.4";
+        internal const string Version = "2.1.0";
     }
 }