diff --git a/src/Pickles/.vs/config/applicationhost.config b/src/Pickles/.vs/config/applicationhost.config
index 984e93ccf..92bc9d04d 100644
--- a/src/Pickles/.vs/config/applicationhost.config
+++ b/src/Pickles/.vs/config/applicationhost.config
@@ -163,7 +163,7 @@
             </site>
             <site name="Pickles.BaseDhtmlFiles" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="D:\wps\kpi\pickles_plv\src\Pickles\Pickles.BaseDhtmlFiles" />                </application>
+                    <virtualDirectory path="/" physicalPath="C:\Users\aadams\Documents\ADP\pickles\src\Pickles\Pickles.BaseDhtmlFiles" />                </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:52000:localhost" />
                 </bindings>
diff --git a/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.csproj b/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.csproj
index 3bdfb6938..af895782c 100644
--- a/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.csproj
+++ b/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.csproj
@@ -16,6 +16,22 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>C:\Users\aadams\Documents\ADP\published_files\pickles\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -41,6 +57,18 @@
   <PropertyGroup>
     <StartupObject>PicklesDoc.Pickles.CommandLine.Program</StartupObject>
   </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>58C81F2E680EB86FABDBEE60F94068CFF0846BAC</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>Pickles.CommandLine_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
       <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
@@ -92,8 +120,21 @@
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="Pickles.CommandLine_TemporaryKey.pfx" />
     <None Include="Settings.StyleCop" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Pickles/Pickles.CommandLine/Pickles.CommandLine_TemporaryKey.pfx b/src/Pickles/Pickles.CommandLine/Pickles.CommandLine_TemporaryKey.pfx
new file mode 100644
index 000000000..7741cecfa
Binary files /dev/null and b/src/Pickles/Pickles.CommandLine/Pickles.CommandLine_TemporaryKey.pfx differ
diff --git a/src/Pickles/Pickles.CommandLine/Program.cs b/src/Pickles/Pickles.CommandLine/Program.cs
index da79a71df..3af1dd0c1 100644
--- a/src/Pickles/Pickles.CommandLine/Program.cs
+++ b/src/Pickles/Pickles.CommandLine/Program.cs
@@ -69,6 +69,7 @@ private static int Main(string[] args)
                 {
                     if (Log.IsFatalEnabled)
                     {
+                        Log.Info(ex.StackTrace);
                         Log.Fatal(ex, "Pickles did not complete successfully");
                     }
 
diff --git a/src/Pickles/Pickles.DocumentationBuilders.Html/HtmlImageResultFormatter.cs b/src/Pickles/Pickles.DocumentationBuilders.Html/HtmlImageResultFormatter.cs
index 7bc1b27e8..f6c7c469e 100644
--- a/src/Pickles/Pickles.DocumentationBuilders.Html/HtmlImageResultFormatter.cs
+++ b/src/Pickles/Pickles.DocumentationBuilders.Html/HtmlImageResultFormatter.cs
@@ -153,7 +153,13 @@ public XElement Format(ScenarioOutline scenarioOutline, params string[] exampleV
         {
             if (this.configuration.HasTestResults)
             {
-                TestResult exampleResult = this.results.GetExampleResult(scenarioOutline, exampleValues);
+                TestResult exampleResult = TestResult.Inconclusive;
+
+                try
+                {
+                    exampleResult = this.results.GetExampleResult(scenarioOutline, exampleValues);
+                }
+                catch (Exception) { }
 
                 return this.BuildImageElement(exampleResult);
             }
diff --git a/src/Pickles/Pickles.Test/WhenParsingCommandLineArguments.cs b/src/Pickles/Pickles.Test/WhenParsingCommandLineArguments.cs
index c533a3e9d..bf0ee4553 100644
--- a/src/Pickles/Pickles.Test/WhenParsingCommandLineArguments.cs
+++ b/src/Pickles/Pickles.Test/WhenParsingCommandLineArguments.cs
@@ -46,6 +46,9 @@ public class WhenParsingCommandLineArguments : BaseFixture
             "      --lr, --link-results-file=VALUE" + "{0}" +
             "                             the path to the linked test results file (can be " + "{0}" +
             "                               a semicolon-separated list of files)" + "{0}" +
+            "      --ld, --link-results-directory=VALUE" + "{0}" +
+            "                             directory to start scanning recursively for " + "{0}" +
+            "                               results files" + "{0}" +
             "      --sn, --system-under-test-name=VALUE" + "{0}" +
             "                             the name of the system under test" + "{0}" +
             "      --sv, --system-under-test-version=VALUE" + "{0}" +
diff --git a/src/Pickles/Pickles.TestFrameworks/CucumberJson/CucumberJsonSingleResultLoader.cs b/src/Pickles/Pickles.TestFrameworks/CucumberJson/CucumberJsonSingleResultLoader.cs
index 929fafea9..d90c5aaa4 100644
--- a/src/Pickles/Pickles.TestFrameworks/CucumberJson/CucumberJsonSingleResultLoader.cs
+++ b/src/Pickles/Pickles.TestFrameworks/CucumberJson/CucumberJsonSingleResultLoader.cs
@@ -31,7 +31,14 @@ public class CucumberJsonSingleResultLoader : ISingleResultLoader
     {
         public SingleTestRunBase Load(FileInfoBase fileInfo)
         {
-            return new CucumberJsonSingleResults(this.ReadResultsFile(fileInfo));
+            List<Feature> features = this.ReadResultsFile(fileInfo);
+            if (features == null)
+            {
+                Console.WriteLine("There was an issue with the results format for " + fileInfo.Name);
+                features = new List<Feature>();
+            }
+
+            return new CucumberJsonSingleResults(features);
         }
 
         private List<Feature> ReadResultsFile(FileInfoBase testResultsFile)
diff --git a/src/Pickles/Pickles/CommandLineArgumentParser.cs b/src/Pickles/Pickles/CommandLineArgumentParser.cs
index 5969231bc..6de2b3f06 100644
--- a/src/Pickles/Pickles/CommandLineArgumentParser.cs
+++ b/src/Pickles/Pickles/CommandLineArgumentParser.cs
@@ -44,6 +44,9 @@ public class CommandLineArgumentParser
 
         public const string HelpTestResultsFile =
             "the path to the linked test results file (can be a semicolon-separated list of files)";
+        public const string HelpTestResultsDir =
+            "directory to start scanning recursively for results files";
+
 
         private readonly IFileSystem fileSystem;
         private readonly OptionSet options;
@@ -55,6 +58,7 @@ public class CommandLineArgumentParser
         private string systemUnderTestName;
         private string systemUnderTestVersion;
         private string testResultsFile;
+        private string testResultsDirectory;
         private string testResultsFormat;
         private bool versionRequested;
         private bool includeExperimentalFeatures;
@@ -70,6 +74,7 @@ public CommandLineArgumentParser(IFileSystem fileSystem)
                 { "o|output-directory=", HelpOutputDir, v => this.outputDirectory = v },
                 { "trfmt|test-results-format=", HelpTestResultsFormat, v => this.testResultsFormat = v },
                 { "lr|link-results-file=", HelpTestResultsFile, v => this.testResultsFile = v },
+                { "ld|link-results-directory=", HelpTestResultsDir, v => this.testResultsDirectory = v },
                 { "sn|system-under-test-name=", HelpSutName, v => this.systemUnderTestName = v },
                 { "sv|system-under-test-version=", HelpSutVersion, v => this.systemUnderTestVersion = v },
                 { "l|language=", HelpLanguageFeatureFiles, v => this.language = v },
@@ -125,6 +130,13 @@ public bool Parse(string[] args, IConfiguration configuration, TextWriter stdout
                 configuration.AddTestResultFiles(files.Select(f => this.fileSystem.FileInfo.FromFileName(f)));
             }
 
+            if (!string.IsNullOrEmpty(this.testResultsDirectory))
+            {
+                configuration.AddTestResultFiles(
+                    this.fileSystem.DirectoryInfo.FromDirectoryName(
+                        this.testResultsDirectory).EnumerateFiles("*.json", System.IO.SearchOption.AllDirectories));
+            }
+
             if (!string.IsNullOrEmpty(this.systemUnderTestName))
             {
                 configuration.SystemUnderTestName = this.systemUnderTestName;
diff --git a/src/Pickles/Pickles/ConfigurationReporter.cs b/src/Pickles/Pickles/ConfigurationReporter.cs
index 62f0f925a..9f753baff 100644
--- a/src/Pickles/Pickles/ConfigurationReporter.cs
+++ b/src/Pickles/Pickles/ConfigurationReporter.cs
@@ -40,7 +40,23 @@ public void ReportOn(IConfiguration configuration, Action<string> writeToLog)
             if (configuration.HasTestResults)
             {
                 writeToLog($"Test Result Format        : {configuration.TestResultsFormat}");
-                writeToLog($"Test Result File          : {configuration.TestResultsFile.FullName}");
+                int result = 0;
+                string fileList = "";
+                using (var enumerator = configuration.TestResultsFiles.GetEnumerator())
+                {
+                    while (enumerator.MoveNext())
+                    {
+                        fileList += enumerator.Current.FullName + "; ";
+                        result++;
+                    } 
+                }
+                if (result == 1) {
+                    writeToLog($"Test Result File          : {configuration.TestResultsFile.FullName}");
+                }
+                else
+                {
+                    writeToLog($"Test Result Files         : {fileList.Substring(0, fileList.Length - 2)}");
+                }
             }
         }
     }
diff --git a/src/Pickles/Pickles/Runner.cs b/src/Pickles/Pickles/Runner.cs
index 1f8089e86..24985d031 100644
--- a/src/Pickles/Pickles/Runner.cs
+++ b/src/Pickles/Pickles/Runner.cs
@@ -97,7 +97,15 @@ private static void SetResultsForIndividualScenariosUnderFeature(FeatureNode fea
 
                 if (scenario != null)
                 {
-                    featureElement.Result = testResults.GetScenarioResult(scenario);
+                    try { 
+                        featureElement.Result = testResults.GetScenarioResult(scenario);
+                    }
+                    catch (Exception e)
+                    {
+                        Log.Error("An exception occured in aligning results with the feature for : " +
+                            featureTreeNode.Feature.Name +
+                            " Message: " + e.Message);
+                    }
                     continue;
                 }
 
@@ -105,15 +113,22 @@ private static void SetResultsForIndividualScenariosUnderFeature(FeatureNode fea
 
                 if (scenarioOutline != null)
                 {
-                    foreach (var example in scenarioOutline.Examples.SelectMany(e => e.TableArgument.DataRows))
+                    try
                     {
-                        example.Result = testResults.GetExampleResult(scenarioOutline, example.Cells.ToArray());
+                        foreach (var example in scenarioOutline.Examples.SelectMany(e => e.TableArgument.DataRows))
+                        {
+                            example.Result = testResults.GetExampleResult(scenarioOutline, example.Cells.ToArray());
+                        }
+
+                        scenarioOutline.Result =
+                            scenarioOutline.Examples.SelectMany(e => e.TableArgument.DataRows)
+                                .Select(row => row.Result)
+                                .Merge();
+                    } catch (Exception e) {
+                        Log.Error("An exception occured in aligning results with the feature for : " +
+                            featureTreeNode.Feature.Name +
+                            " Message: " + e.Message);
                     }
-
-                    scenarioOutline.Result =
-                        scenarioOutline.Examples.SelectMany(e => e.TableArgument.DataRows)
-                            .Select(row => row.Result)
-                            .Merge();
                 }
             }
         }