diff --git a/CHANGELOG.md b/CHANGELOG.md
index f75e146..cafd619 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,15 +3,15 @@ IMPROVEMENTS:
 
 * Reworked Wiki for creating custom scripts
 * Setup does now show the full path where the modules are installed
-* Added Lightweight C# Command Line Parser for Xteq5CLI (http://www.codeproject.com/Articles/39120/Lightweight-C-Command-Line-Parser)
 * Added Xteq5CLI
+* Added Lightweight C# Command Line Parser for Xteq5CLI (http://www.codeproject.com/Articles/39120/Lightweight-C-Command-Line-Parser)
 * Added Xteq5UserInterface library
 * Added SimplifiedXteq5Runner for *UI programs (Xteq5GUI and Xteq5CLI)
 * Rewritten HTMLBootstrapGenerator using new BaseTemplateReplaceGenerator class
 * Renamed HTML template to "BootstrapTemplate.html"
+* Added XML and JSON output formats
 * Improvments for Xteq5Engine
 
-
 BUG FIXES:
 
 * Fixed bug in all scripts, #requires was missing the _s_ at the end
diff --git a/README.md b/README.md
index a521af2..a492ec0 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,9 @@ About Xteq5
  
 A known issues testing framework, powered by PowerShell scripts.
 
-Why you want to use it: Computer systems today are complex. Some years ago, if software A did not run, the reason was “A requires B and B is not installed”. Today it’s more like “A does not run because B is not working as the value C in D is not set by E”. 
+Computer systems today are complex. Some years ago, if software A did not run, the reason was "A requires B and B is not installed". Today it’s more like "A does not run because B is not working as the value C in D is not set by E". 
 
-Using Xteq5, you could now write PowerShell scripts that test A, B, C, D and E. The generated HTML report ([Example][_examplereport]) will then inform you if, and what, isn’t right. From that time on, you don’t have to remember this case anymore. Just run Xteq5 again and you will be informed in seconds.
+Using Xteq5, you could now write PowerShell scripts that test A, B, C, D and E. The generated HTML report ([Example][_examplereport]) will then inform you if, and what, isn’t right. From that time on, you don’t have to remember this case anymore. Just run Xteq5 again and you will be informed in seconds. This can also be done silently using the command line, resulting in a XML or JSON report for further automated processing. 
 
 This procedure can lead to cost savings if you have separated 1st and 2nd level support teams. The 1st level support can check with Xteq5 if the problem is already known and fix it without escalating to 2nd level. This means higher first call resolution rates for 1st level and less tickets for 2nd level. 
 
@@ -30,7 +30,7 @@ The most recent version can be downloaded from [Releases][_downloads].
 <!-- These links are also used in /src/setup/_Setup.iss -->
 
 * Windows 7 SP1 / Windows Server 2008 SP2 (or higher)
-* 256MB free memory, 5 MB free disk space
+* 256MB free memory, 6 MB free disk space
 * [.NET Framework 4.5][_netframework] (or higher)
 * [PowerShell 4.0][_wmf] (or higher)
 * Download links are provided by Setup.exe if one of the components is not installed
@@ -38,7 +38,7 @@ The most recent version can be downloaded from [Releases][_downloads].
 
 ##<a name="docs">Documentation</a>
 
-Please see the [Xteq5 Wiki][_wiki] for [How to use][_wiki_howto] and about creating [custom scripts][_wiki_customscripts].
+Please see the [Xteq5 Wiki][_wiki] for [How to use][_wiki_howto] it, creating your [own assets or tests][_wiki_customscripts], [customize][_wiki_setup] the installation or utilizing the [command line interface][_wiki_cli].  
 
 ##<a name="contribute">Contributions</a>
 
@@ -85,4 +85,6 @@ Licensed under the **Apache License, Version 2.0**. For details, please see [LIC
 [_wiki]: https://github.com/texhex/xteq5/wiki
 [_wiki_howto]: https://github.com/texhex/xteq5/wiki/How-to-use
 [_wiki_customscripts]: https://github.com/texhex/xteq5/wiki/Custom-scripts
+[_wiki_setup]: https://github.com/texhex/xteq5/wiki/Setup-customization
+[_wiki_cli]: https://github.com/texhex/xteq5/wiki/Command-line-interface
 
diff --git a/images/Convert_Icons.bat b/images/Convert_Icons.bat
index aea1d43..1f7dca9 100644
--- a/images/Convert_Icons.bat
+++ b/images/Convert_Icons.bat
@@ -11,4 +11,7 @@ SET EXE_CONVERT=C:\_Tools\ImageMagick-6.9.0-2\convert.exe
 REM -colors 256 
 "%EXE_CONVERT%" Xteq5_Icon_16x16.ico Xteq5_Icon_32x32.ico Xteq5_Icon_48x48.ico Xteq5_Icon.ico
 
+"%EXE_CONVERT%" Xteq5_Icon_Secondary_16x16.ico Xteq5_Icon_Secondary_32x32.ico Xteq5_Icon_Secondary_48x48.ico Xteq5_Icon_Secondary.ico
+
+
 pause
diff --git a/images/Xteq5_Icon_Secondary.ico b/images/Xteq5_Icon_Secondary.ico
new file mode 100644
index 0000000..2d0e000
Binary files /dev/null and b/images/Xteq5_Icon_Secondary.ico differ
diff --git a/images/Xteq5_Icon_Secondary_16x16.ico b/images/Xteq5_Icon_Secondary_16x16.ico
new file mode 100644
index 0000000..74834f6
Binary files /dev/null and b/images/Xteq5_Icon_Secondary_16x16.ico differ
diff --git a/images/Xteq5_Icon_Secondary_32x32.ico b/images/Xteq5_Icon_Secondary_32x32.ico
new file mode 100644
index 0000000..dfafb5f
Binary files /dev/null and b/images/Xteq5_Icon_Secondary_32x32.ico differ
diff --git a/images/Xteq5_Icon_Secondary_48x48.ico b/images/Xteq5_Icon_Secondary_48x48.ico
new file mode 100644
index 0000000..934d702
Binary files /dev/null and b/images/Xteq5_Icon_Secondary_48x48.ico differ
diff --git a/licenses/LICENSE-CPOL.htm b/licenses/LICENSE-CPOL.htm
index 6f758c8..13f0883 100644
--- a/licenses/LICENSE-CPOL.htm
+++ b/licenses/LICENSE-CPOL.htm
@@ -1,4 +1,4 @@
-?<html>
+<html>
 <head>
 <title>The Code Project Open License (CPOL)</title>
 <Style>
diff --git a/licenses/LICENSE.txt b/licenses/LICENSE.txt
index 2667cfd..b213876 100644
--- a/licenses/LICENSE.txt
+++ b/licenses/LICENSE.txt
@@ -67,7 +67,15 @@ Licensed under the Inno Setup License
    http://www.jrsoftware.org/files/is/license.txt
    The license is distributed with this software as LICENSE-InnoSetup.txt
 
- 
+   
+JSON.NET
+Copyright (c) 2007 James Newton-King
+http://james.newtonking.com/json
+Licensed under the MIT License
+   https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md
+   The license is distributed with this software as LICENSE-JSON.NET.txt
+   
+
 This product includes software developed by Jon Skeet
 http://www.jonskeet.uk/
 Copyright (c) 2004-2006 Jon Skeet. All rights reserved.
diff --git a/scripts/XMLtemplate.xml b/scripts/XMLtemplate.xml
index f16f506..2aac36a 100644
--- a/scripts/XMLtemplate.xml
+++ b/scripts/XMLtemplate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Xteq5 XML template version 1.06
-     
+<!-- Xteq5 XML template version 1.06 -->
+<!-- 
      It is assumed that this file will be used for automatic processing.
      Therefore it contains only the minimum required information in order to reduce the file size. 
  -->
diff --git a/src/Readme.md b/src/Readme.md
index b3e378d..856744f 100644
--- a/src/Readme.md
+++ b/src/Readme.md
@@ -14,7 +14,7 @@
 ## Projects
  - `HeadlessPS` is a library to run scripts using PowerShell.
  - `Xteq5Engine` is the main library and uses HeadlessPS to run assets and tests.
- - `Xteq5OutputGenerator` is used to generate output files (HTML, XML) from a report
+ - `Xteq5OutputGenerator` is used to generate output files (HTML, XML, JSON) from a report
  - `Xteq5UserInterface` contains helper functions for a program that interacts with a user 
  - `Xteq5GUI` (Xteq5.exe) is the GUI used to operate Xteq5, it uses all four libraries above.
  - `Xteq5CLI` (Xteq5Cli.exe) is a command line interface for Xteq5, it uses all four libraries above.
diff --git a/src/Setup/Setup.iss b/src/Setup/Setup.iss
index a5e685b..7ca0af0 100644
--- a/src/Setup/Setup.iss
+++ b/src/Setup/Setup.iss
@@ -149,7 +149,7 @@ Source: "scripts\*.*"; DestDir: "{commonappdata}\Xteq5\"; Flags: ignoreversion r
 ;All license files go to \licenses
 Source: "licenses\*.*"; DestDir: "{app}\licenses"; Flags: ignoreversion recursesubdirs;
 
-;Xteq5Launcher 
+;Xteq5Launcher (Does not use ann DLLs)
 Source: "src\Xteq5Launcher\bin\release\*.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs;
 Source: "src\Xteq5Launcher\bin\release\*.config"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs;
 
@@ -163,6 +163,17 @@ Source: "src\Xteq5GUI\bin\x86\release\*.exe"; DestDir: "{app}\32bit"; Flags: ign
 Source: "src\Xteq5GUI\bin\x86\release\*.dll"; DestDir: "{app}\32bit"; Flags: ignoreversion recursesubdirs;
 Source: "src\Xteq5GUI\bin\x86\release\*.config"; DestDir: "{app}\32bit"; Flags: ignoreversion recursesubdirs;
 
+;Xteq5CLI (64 bit)
+Source: "src\Xteq5CLI\bin\x64\release\*.exe"; DestDir: "{app}\64bit"; Flags: ignoreversion recursesubdirs;
+Source: "src\Xteq5CLI\bin\x64\release\*.dll"; DestDir: "{app}\64bit"; Flags: ignoreversion recursesubdirs;
+Source: "src\Xteq5CLI\bin\x64\release\*.config"; DestDir: "{app}\64bit"; Flags: ignoreversion recursesubdirs;
+
+;Xteq5CLI (32 bit)
+Source: "src\Xteq5CLI\bin\x86\release\*.exe"; DestDir: "{app}\32bit"; Flags: ignoreversion recursesubdirs;
+Source: "src\Xteq5CLI\bin\x86\release\*.dll"; DestDir: "{app}\32bit"; Flags: ignoreversion recursesubdirs;
+Source: "src\Xteq5CLI\bin\x86\release\*.config"; DestDir: "{app}\32bit"; Flags: ignoreversion recursesubdirs;
+
+
 
 [Ini]
 ;Create VERSION.ini to allow the user to easily see the version currently installed. 
diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs
index 7378400..aa19608 100644
--- a/src/SharedAssemblyInfo.cs
+++ b/src/SharedAssemblyInfo.cs
@@ -8,7 +8,7 @@
 
 [assembly: AssemblyTitle("Xteq5")] //Explorer: File description
 [assembly: AssemblyProduct("http://www.xteq5.com/")] //Explorer: Product name
-[assembly: AssemblyVersion("2.16.*")] //Explorer: Product version
+[assembly: AssemblyVersion("2.17.*")] //Explorer: Product version
 //[assembly: AssemblyFileVersion("1.0.0.0")] //If not set, AssemblyVersion is also used for AssemblyFileVersion. Explorer: File version
 
 
diff --git a/src/Xteq5CLI/CMDLineParser.cs b/src/Xteq5CLI/CMDLineParser.cs
index 0b26732..656a7d2 100644
--- a/src/Xteq5CLI/CMDLineParser.cs
+++ b/src/Xteq5CLI/CMDLineParser.cs
@@ -789,6 +789,7 @@ private void SetIdentifiedDecimalSeperator(string parameter)
         /// <summary>
         /// Command line parsing Exception.
         /// </summary>
+        [Serializable]
         public class CMDLineParserException : Exception
         {
             public CMDLineParserException(string message)
@@ -798,6 +799,7 @@ public CMDLineParserException(string message)
         /// <summary>
         /// Thrown when required option was not detected
         /// </summary>
+        [Serializable]
         public class MissingRequiredOptionException : CMDLineParserException
         {
             public MissingRequiredOptionException(string message)
@@ -807,6 +809,7 @@ public MissingRequiredOptionException(string message)
         /// <summary>
         /// Thrown when invalid (not registered) options have been detected
         /// </summary>
+        [Serializable]
         public class InvalidOptionsException : CMDLineParserException
         {
             public InvalidOptionsException(string message)
@@ -816,6 +819,7 @@ public InvalidOptionsException(string message)
         /// <summary>
         /// Thrown when duplicate option was detected
         /// </summary>
+        [Serializable]
         public class DuplicateOptionException : CMDLineParserException
         {
             public DuplicateOptionException(string message)
@@ -825,6 +829,7 @@ public DuplicateOptionException(string message)
         /// <summary>
         /// Thrown when parameter value conversion to specified type failed 
         /// </summary>
+        [Serializable]
         public class ParameterConversionException : CMDLineParserException
         {
             public ParameterConversionException(string message)
diff --git a/src/Xteq5CLI/WorkInstruction.cs b/src/Xteq5CLI/WorkInstruction.cs
index 78a913b..32695de 100644
--- a/src/Xteq5CLI/WorkInstruction.cs
+++ b/src/Xteq5CLI/WorkInstruction.cs
@@ -31,32 +31,34 @@ public WorkInstruction(string[] CommandlineArguments)
             CMDLineParser parser = new CMDLineParser();
             parser.throwInvalidOptionsException = true;
 
+            //Until further notice, no aliases are supported except for HELP. 
+
             //Add -Help option
             CMDLineParser.Option HelpOption = parser.AddBoolSwitch("-Help", "Displays help");
             HelpOption.AddAlias("/?");
 
             //Add -Run option
             CMDLineParser.Option RunOption = parser.AddBoolSwitch("-Run", "Required. Execute all files in compilation path");
-            RunOption.AddAlias("/Run");
+            //RunOption.AddAlias("/Run");
 
             //Add -Path parameter
             CompilationPathOption PathParameter = new CompilationPathOption("-Path", "Compilation path to load scripts from", false);
-            PathParameter.AddAlias("/Path");
+            //PathParameter.AddAlias("/Path");
             parser.AddOption(PathParameter);
 
             //Add -Format parameter
             ReportFormatOption FormatParameter = new ReportFormatOption("-Format", "Format of the report that should be generated (HTML, XML ...)", false);
-            FormatParameter.AddAlias("/Format");
+            //FormatParameter.AddAlias("/Format");
             parser.AddOption(FormatParameter);
 
             //Add -Filename parameter
             FilenameOption FilenameParameter = new FilenameOption("-Filename", "Filename of the generated report", false);
-            FilenameParameter.AddAlias("/Filename");
+            //FilenameParameter.AddAlias("/Filename");
             parser.AddOption(FilenameParameter);
 
             //Add -Text parameter
-            CMDLineParser.Option TextParameter = parser.AddStringParameter("-Text", "Additonal text to be included in generated report", false);
-            FilenameParameter.AddAlias("/Text");
+            CMDLineParser.Option TextParameter = parser.AddStringParameter("-Text", "Additional text to be included in generated report", false);
+            //FilenameParameter.AddAlias("/Text");
 
             bool commandLineParsed = false;
 
@@ -102,10 +104,10 @@ public WorkInstruction(string[] CommandlineArguments)
 
                             //Check for the FORMAT parameter and use HTML if not set
                             string reportFormatString = OptionIsMatchedAndNotEmpty(FormatParameter) ? FormatParameter.Value.ToString() : "HTML";
+                            
                             //This direct cast without any error checking is OK because FORMATPARAMETER already tried to parse it and will only be set if the value is OK
                             this.DestinationFormat = OutputFormatConverter.ParseReportFormat(reportFormatString);
 
-
                             this.UserText = OptionIsMatchedAndNotEmpty(TextParameter) ? TextParameter.Value.ToString() : "";                           
 
                         }
diff --git a/src/Xteq5CLI/Xteq5CLI.csproj b/src/Xteq5CLI/Xteq5CLI.csproj
index efb8c86..d73d412 100644
--- a/src/Xteq5CLI/Xteq5CLI.csproj
+++ b/src/Xteq5CLI/Xteq5CLI.csproj
@@ -71,6 +71,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Xteq5_Icon_Secondary.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -110,6 +113,9 @@
       <Name>Yamua</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Xteq5_Icon_Secondary.ico" />
+  </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/Xteq5CLI/Xteq5CLIMain.cs b/src/Xteq5CLI/Xteq5CLIMain.cs
index 42c4cbd..10ee4bb 100644
--- a/src/Xteq5CLI/Xteq5CLIMain.cs
+++ b/src/Xteq5CLI/Xteq5CLIMain.cs
@@ -23,6 +23,9 @@
    -Run -Filename "C:\Temp\daresult.xml" -Format XML
    -Run -Filename "C:\Temp\daresult.xml" -Format XML -Text "blah BLUB"
    -Run -Path "C:\dev\git\Xteq5\scripts" -Format XML -Filename "C:\Temp\result.xml" -Text "My comment"
+   -Run -Path "C:\dev\git\Xteq5\scripts" -Format JSON -Filename "C:\Temp\result.json" -Text "My comment"
+   -Run -Path "C:\dev\git\Xteq5\src\ScriptsForTesting\Test1" -Format JSON -Filename "C:\Temp\result.json" -Text "My comment"
+ 
  
 */
 namespace Xteq5CLI
diff --git a/src/Xteq5CLI/Xteq5_Icon_Secondary.ico b/src/Xteq5CLI/Xteq5_Icon_Secondary.ico
new file mode 100644
index 0000000..2d0e000
Binary files /dev/null and b/src/Xteq5CLI/Xteq5_Icon_Secondary.ico differ
diff --git a/src/Xteq5Engine/Xteq5Runner.cs b/src/Xteq5Engine/Xteq5Runner.cs
index 668c6ca..3fef53f 100644
--- a/src/Xteq5Engine/Xteq5Runner.cs
+++ b/src/Xteq5Engine/Xteq5Runner.cs
@@ -13,7 +13,7 @@
 namespace Xteq5
 {
     /// <summary>
-    /// This allows to run a test suite (Assets and Tests).
+    /// This processes an compilation folder (Assets and Tests)
     /// </summary>
     public class Xteq5Runner
     {
@@ -35,7 +35,7 @@ public Report Run(string CompilationPath)
         }
 
         /// <summary>
-        /// Executes all assets and tests found in BasePath asynchronously
+        /// Executes all assets and tests found in CompilationPath asynchronously
         /// </summary>
         /// <param name="CompilationPath">Directory to read data from. Must contain the required subfolders ASSETS, TESTS and MODULES.</param>
         public async Task<Report> RunAsync(string CompilationPath)
diff --git a/src/Xteq5OutputGenerator/BaseGenerator.cs b/src/Xteq5OutputGenerator/BaseGenerator.cs
new file mode 100644
index 0000000..d49cc9b
--- /dev/null
+++ b/src/Xteq5OutputGenerator/BaseGenerator.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Xteq5
+{
+    public abstract class BaseGenerator
+    {
+        //Base function that is called by a consumer of an implementation of this class
+        public abstract string Generate(Report Report);
+
+    }
+}
diff --git a/src/Xteq5OutputGenerator/BaseTemplateReplaceGenerator.cs b/src/Xteq5OutputGenerator/BaseTemplateReplaceGenerator.cs
index cba005f..113a9b0 100644
--- a/src/Xteq5OutputGenerator/BaseTemplateReplaceGenerator.cs
+++ b/src/Xteq5OutputGenerator/BaseTemplateReplaceGenerator.cs
@@ -11,7 +11,7 @@ namespace Xteq5
     /// <summary>
     /// A base class for class that reads a template file and then replaces the content with the actual values.
     /// </summary>
-    public abstract class BaseTemplateReplaceGenerator
+    public abstract class BaseTemplateReplaceGenerator : BaseGenerator
     {
         protected StringBuilder _content = new StringBuilder();
 
@@ -29,6 +29,12 @@ protected void ReadTemplate(string TemplateFilepath)
             _content = new StringBuilder(File.ReadAllText(TemplateFilepath, Encoding.UTF8));
         }
 
+        //Because we require a template, this function can't be used
+        public override string Generate(Report Report)
+        {
+            throw new NotImplementedException();
+        }
+
         //Base function that is called by a consumer of an implementation of this class
         public abstract string Generate(Report Report, string TemplateFilepath);
 
diff --git a/src/Xteq5OutputGenerator/BootstrapHTMLGenerator2.cs b/src/Xteq5OutputGenerator/BootstrapHTMLGenerator.cs
similarity index 98%
rename from src/Xteq5OutputGenerator/BootstrapHTMLGenerator2.cs
rename to src/Xteq5OutputGenerator/BootstrapHTMLGenerator.cs
index dc34d04..7a41462 100644
--- a/src/Xteq5OutputGenerator/BootstrapHTMLGenerator2.cs
+++ b/src/Xteq5OutputGenerator/BootstrapHTMLGenerator.cs
@@ -7,9 +7,9 @@
 
 namespace Xteq5
 {
-    public class BootstrapHTMLGenerator2 : BaseTemplateReplaceGenerator
+    public class BootstrapHTMLGenerator : BaseTemplateReplaceGenerator
     {
-        public BootstrapHTMLGenerator2()
+        public BootstrapHTMLGenerator()
         {
 
         }
diff --git a/src/Xteq5OutputGenerator/JSONGenerator.cs b/src/Xteq5OutputGenerator/JSONGenerator.cs
new file mode 100644
index 0000000..bca7bd0
--- /dev/null
+++ b/src/Xteq5OutputGenerator/JSONGenerator.cs
@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace Xteq5
+{
+    //The result json can be validated using http://jsonlint.com/
+
+    //I'm still unsure if the result JSON should be enveloped or not. 
+    //It seems we shouldn't: http://www.vinaysahni.com/best-practices-for-a-pragmatic-restful-api, section "Don't use an envelope by default, but make it possible when needed"
+
+    public class JSONGenerator : BaseGenerator
+    {
+        //Helper classes to generate the JSON
+        private class ReportClass
+        {
+            public Guid ID;
+            public string Compilation;
+            public Version EngineVersion;
+            public string Username;
+            public string Computername;
+            public string Text;
+            public DateTime StartDateTimeUTC;
+            public DateTime EndDateTimeUTC;
+            public string RuntimeSeconds;
+
+            public IssuesFoundClass IssuesFound;
+
+            public RecordsStatistics AssetStatistics;
+            public RecordsStatistics TestStatistics;
+
+            public List<ItemDetail> Assets;
+            public List<ItemDetail> Tests;
+        }
+
+        private class IssuesFoundClass
+        {
+            public bool Any;
+            public bool Assets;
+            public bool Tests;
+        }
+
+        private class ItemDetail
+        {
+            public string Name;
+            public string Filename;
+            public ConclusionEnum Conclusion;
+            public string ConclusionString;
+            public ItemResult Result;
+        }
+
+        private class ItemResult
+        {
+            public string Primary;
+            public string Seconday;
+        }
+
+
+        /// <summary>
+        /// Generates a JSON formated output report
+        /// </summary>
+        /// <param name="Report">The report that should be transfered into JSON</param>
+        /// <returns>A JSON formated string</returns>
+        public override string Generate(Xteq5.Report Report)
+        {
+            ReportClass rep = new ReportClass();
+            rep.IssuesFound = new IssuesFoundClass();
+
+            rep.ID = Report.ID;
+            rep.Compilation = Report.CompilationFolder;
+            rep.EngineVersion = Report.EngineVersion;
+            rep.Username = Report.UserName;
+            rep.Computername = Report.ComputerName;
+            rep.Text = Report.UserText;
+            rep.StartDateTimeUTC = Report.StartedUTC;
+            rep.EndDateTimeUTC = Report.EndedUTC;
+            rep.RuntimeSeconds = Report.RuntimeSeconds;
+
+            rep.IssuesFound.Any = Report.IssuesFound;
+            rep.IssuesFound.Assets = Report.AssetIssuesFound;
+            rep.IssuesFound.Tests = Report.TestIssuesFound;
+
+            rep.AssetStatistics = Report.AssetStatiscs;
+            rep.TestStatistics = Report.TestStatiscs;
+
+            rep.Assets = new List<ItemDetail>();
+            rep.Tests = new List<ItemDetail>();
+
+            //Loop over all assets
+            foreach (AssetRecord asset in Report.Assets)
+            {
+                BaseRecord baseRec = asset as BaseRecord;
+                rep.Assets.Add(ConvertToItemDetail(baseRec));
+            }
+
+            //Loop over all tests
+            foreach (TestRecord test in Report.Tests)
+            {
+                BaseRecord baseRec = test as BaseRecord;
+                rep.Tests.Add(ConvertToItemDetail(baseRec));
+            }
+
+            //MTH: I can't even imaging how much magic happens in this single call. 
+            return JsonConvert.SerializeObject(rep);
+        }
+
+        private ItemDetail ConvertToItemDetail(BaseRecord BaseRec)
+        {
+            ItemDetail detail = new ItemDetail();
+            detail.Name = BaseRec.Name;
+            detail.Filename = BaseRec.ScriptFilename;
+            detail.Conclusion = BaseRec.Conclusion;
+            detail.ConclusionString = BaseRec.Conclusion.ToString();
+
+            ResultPrimarySecondary rps = new ResultPrimarySecondary(BaseRec);
+
+            ItemResult result = new ItemResult();
+            result.Primary = rps.Primary;
+            result.Seconday = rps.Secondary;
+
+            detail.Result = result;
+
+            return detail;
+        }
+    }
+}
diff --git a/src/Xteq5OutputGenerator/OutputGenerator.cs b/src/Xteq5OutputGenerator/OutputGenerator.cs
index 54ffe01..92000a6 100644
--- a/src/Xteq5OutputGenerator/OutputGenerator.cs
+++ b/src/Xteq5OutputGenerator/OutputGenerator.cs
@@ -26,7 +26,7 @@ public static string GenerateReportOutput(Report Report, OutputFormatEnum Format
             {
                 case OutputFormatEnum.HTML:
                     string htmlTemplatePath = PathExtension.Combine(Report.CompilationFolder, "BootstrapTemplate.html");
-                    BootstrapHTMLGenerator2 htmlGenerator = new BootstrapHTMLGenerator2();                    
+                    BootstrapHTMLGenerator htmlGenerator = new BootstrapHTMLGenerator();                    
                     return htmlGenerator.Generate(Report, htmlTemplatePath);
 
                 case OutputFormatEnum.XML:
@@ -34,8 +34,13 @@ public static string GenerateReportOutput(Report Report, OutputFormatEnum Format
                     XMLGenerator xmlGenerator = new XMLGenerator();
                     return xmlGenerator.Generate(Report, xmlTemplate);
 
+                case OutputFormatEnum.JSON:
+                    //JSONGenerator does not use a template
+                    JSONGenerator jsonGenerator = new JSONGenerator();
+                    return jsonGenerator.Generate(Report);
+
                 default:
-                    throw new NotImplementedException("Only HTML is currently supported");
+                    throw new ArgumentException(string.Format("OutputFormat {0} is not supported", Format.ToString()));
             }
              
         }
@@ -67,7 +72,7 @@ public static string GenerateReportOutputFile(Report Report, OutputFormatEnum Fo
                     break;
 
                 default:
-                    throw new ArgumentException("Not supported OutputFormat " + Format.ToString());
+                    throw new ArgumentException(string.Format("OutputFormat {0} is not supported", Format.ToString()));
             }
 
             string source = GenerateReportOutput(Report, Format);
diff --git a/src/Xteq5OutputGenerator/XMLGenerator.cs b/src/Xteq5OutputGenerator/XMLGenerator.cs
index f4656a4..f25f6d8 100644
--- a/src/Xteq5OutputGenerator/XMLGenerator.cs
+++ b/src/Xteq5OutputGenerator/XMLGenerator.cs
@@ -9,7 +9,13 @@ namespace Xteq5
 {
     public class XMLGenerator : BaseTemplateReplaceGenerator
     {
-
+      
+        /// <summary>
+        /// Generates XML based on the given Xteq5 Report object
+        /// </summary>
+        /// <param name="Report">The Report which should be converted to XML</param>
+        /// <param name="TemplateFilepath">Templatefile to be used</param>
+        /// <returns>XML string</returns>
         public override string Generate(Report Report, string TemplateFilepath)
         {
             ReadTemplate(TemplateFilepath);
@@ -113,8 +119,6 @@ void ReplaceXMLComment(string ValueName, string Value)
             _content.Replace("<!--@@" + ValueName + "@@-->", Value);
         }
 
-
-
         string CreateRecordDetails(string TagName, BaseRecord Record, ResultPrimarySecondary ResultPrimSecond)
         {
             //Yes, this somewhat cheating....
diff --git a/src/Xteq5OutputGenerator/Xteq5OutputGenerator.csproj b/src/Xteq5OutputGenerator/Xteq5OutputGenerator.csproj
index 722fd92..30ba1e9 100644
--- a/src/Xteq5OutputGenerator/Xteq5OutputGenerator.csproj
+++ b/src/Xteq5OutputGenerator/Xteq5OutputGenerator.csproj
@@ -81,8 +81,10 @@
     <Compile Include="..\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="BaseGenerator.cs" />
     <Compile Include="BaseTemplateReplaceGenerator.cs" />
     <Compile Include="BootstrapHTMLGenerator2.cs" />
+    <Compile Include="JSONGenerator.cs" />
     <Compile Include="OutputGenerator.cs" />
     <Compile Include="OutputFormat.cs" />
     <Compile Include="ResultPrimarySecondary.cs" />
diff --git a/src/Xteq5OutputGenerator_Consumer/Xteq5OutputGeneratorConsumerProgram.cs b/src/Xteq5OutputGenerator_Consumer/Xteq5OutputGeneratorConsumerProgram.cs
index e66b446..9ebed94 100644
--- a/src/Xteq5OutputGenerator_Consumer/Xteq5OutputGeneratorConsumerProgram.cs
+++ b/src/Xteq5OutputGenerator_Consumer/Xteq5OutputGeneratorConsumerProgram.cs
@@ -37,8 +37,7 @@ static void Main(string[] args)
 
             //Set a text on this report
             report.UserText = "Generated by debug consumer";
-            
-            
+                        
             //HTML direct
             /*string templateFile = basepath + @"\BootstrapTemplate.html";
             BootstrapHTMLGenerator2 generator = new BootstrapHTMLGenerator2();            
diff --git a/src/Xteq5UserInterface/Xteq5UIConstant.cs b/src/Xteq5UserInterface/Xteq5UIConstant.cs
index 6254daf..0622d5c 100644
--- a/src/Xteq5UserInterface/Xteq5UIConstant.cs
+++ b/src/Xteq5UserInterface/Xteq5UIConstant.cs
@@ -23,10 +23,10 @@ public static string DefaultCompilationFolder
             }
         }
 
-
         //MTH: These are static readonly fields BY PURPOSE (not CONST) to avoid that the compiler performs an copy+paste to the assembly of the consumer.
         //See [Const Strings - a very convenient way to shoot yourself in the foot](http://www.stum.de/2009/01/14/const-strings-a-very-convenient-way-to-shoot-yourself-in-the-foot/) by [Michael Stum](http://www.stum.de/)        
 
+
         public static readonly string ProjectURL = "https://github.com/texhex/Xteq5/wiki/";
 
         public static readonly string HomepageURL = "http://www.xteq5.com/";