diff --git a/nuget/ZeroFormatter.Interfaces.nuspec b/nuget/ZeroFormatter.Interfaces.nuspec
index 7ad0f95..c777f68 100644
--- a/nuget/ZeroFormatter.Interfaces.nuspec
+++ b/nuget/ZeroFormatter.Interfaces.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>ZeroFormatter.Interfaces</id>
-        <version>1.5.4</version>
+        <version>1.5.5</version>
         <title>ZeroFormatter.Interfaces</title>
         <authors>neuecc</authors>
         <owners>y.neuecc</owners>
diff --git a/nuget/ZeroFormatter.Unity.nuspec b/nuget/ZeroFormatter.Unity.nuspec
index 8a085f2..2dca676 100644
--- a/nuget/ZeroFormatter.Unity.nuspec
+++ b/nuget/ZeroFormatter.Unity.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>ZeroFormatter.Unity</id>
-        <version>1.5.4</version>
+        <version>1.5.5</version>
         <title>ZeroFormatter.Unity</title>
         <authors>neuecc</authors>
         <owners>y.neuecc</owners>
@@ -17,7 +17,7 @@
         </frameworkAssemblies>
         <dependencies>
             <group targetFramework="Unity Full v3.5">
-                <dependency id="ZeroFormatter.Interfaces" version="1.5.4" />
+                <dependency id="ZeroFormatter.Interfaces" version="1.5.5" />
             </group>
         </dependencies>
     </metadata>
diff --git a/nuget/ZeroFormatter.nuspec b/nuget/ZeroFormatter.nuspec
index eeaae4a..511a945 100644
--- a/nuget/ZeroFormatter.nuspec
+++ b/nuget/ZeroFormatter.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>ZeroFormatter</id>
-        <version>1.5.4</version>
+        <version>1.5.5</version>
         <title>ZeroFormatter</title>
         <authors>neuecc</authors>
         <owners>y.neuecc</owners>
@@ -17,10 +17,10 @@
         </frameworkAssemblies>
         <dependencies>
             <group targetFramework=".NETFramework4.5">
-                <dependency id="ZeroFormatter.Interfaces" version="1.5.4" />
+                <dependency id="ZeroFormatter.Interfaces" version="1.5.5" />
             </group>
             <group targetFramework=".NETStandard1.6">
-                <dependency id="ZeroFormatter.Interfaces" version="1.5.4" />
+                <dependency id="ZeroFormatter.Interfaces" version="1.5.5" />
                 <dependency id="System.Reflection.Emit" version="4.0.1" />
                 <dependency id="System.Runtime" version="4.1.0" />
                 <dependency id="System.Runtime.Extensions" version="4.1.0" />
diff --git a/nuget/check_zfc.bat b/nuget/check_zfc.bat
index e17619b..bba133d 100644
--- a/nuget/check_zfc.bat
+++ b/nuget/check_zfc.bat
@@ -1 +1 @@
-zfc -i "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\sandbox\Sandbox.Shared\Sandbox.Shared.csproj" -o "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\tests\ZeroFormatter.UnityTests\Assets\ZeroFormatterGenerated.cs" -c UNITY -u
\ No newline at end of file
+zfc -i "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\sandbox\Sandbox.Shared\Sandbox.Shared.csproj" -o "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\tests\ZeroFormatter.UnityTests\Assets\ZeroFormatterGenerated.cs" -c UNITY -u
\ No newline at end of file
diff --git a/nuget/push.bat b/nuget/push.bat
index 61e49d1..e57a084 100644
--- a/nuget/push.bat
+++ b/nuget/push.bat
@@ -1,4 +1,4 @@
 REM nuget push ZeroFormatter.Analyzer.1.1.1.0.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push ZeroFormatter.1.5.4.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push ZeroFormatter.Interfaces.1.5.4.nupkg -Source https://www.nuget.org/api/v2/package
-nuget push ZeroFormatter.Unity.1.5.4.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push ZeroFormatter.1.5.5.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push ZeroFormatter.Interfaces.1.5.5.nupkg -Source https://www.nuget.org/api/v2/package
+nuget push ZeroFormatter.Unity.1.5.5.nupkg -Source https://www.nuget.org/api/v2/package
diff --git a/sandbox/PerformanceComparison/Properties/AssemblyInfo.cs b/sandbox/PerformanceComparison/Properties/AssemblyInfo.cs
index c28be89..bf46cda 100644
--- a/sandbox/PerformanceComparison/Properties/AssemblyInfo.cs
+++ b/sandbox/PerformanceComparison/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
diff --git a/sandbox/Sandbox.NETCore/project.json b/sandbox/Sandbox.NETCore/project.json
index 33eb56b..ea52c39 100644
--- a/sandbox/Sandbox.NETCore/project.json
+++ b/sandbox/Sandbox.NETCore/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.5.4-*",
+  "version": "1.5.5-*",
   "buildOptions": {
     "emitEntryPoint": true
   },
@@ -9,8 +9,8 @@
       "type": "platform",
       "version": "1.0.0"
     },
-    "ZeroFormatter.Interfaces.NETCore": "1.5.4",
-    "ZeroFormatter.NETCore": "1.5.4"
+    "ZeroFormatter.Interfaces.NETCore": "1.5.5",
+    "ZeroFormatter.NETCore": "1.5.5"
   },
 
   "frameworks": {
diff --git a/sandbox/Sandbox.NETCore/project.lock.json b/sandbox/Sandbox.NETCore/project.lock.json
index ad83c42..bd1b175 100644
--- a/sandbox/Sandbox.NETCore/project.lock.json
+++ b/sandbox/Sandbox.NETCore/project.lock.json
@@ -1992,7 +1992,7 @@
           "lib/netstandard1.3/_._": {}
         }
       },
-      "ZeroFormatter.Interfaces.NETCore/1.5.4": {
+      "ZeroFormatter.Interfaces.NETCore/1.5.5": {
         "type": "project",
         "framework": ".NETStandard,Version=v1.1",
         "dependencies": {
@@ -2006,7 +2006,7 @@
           "netstandard1.1/ZeroFormatter.Interfaces.NETCore.dll": {}
         }
       },
-      "ZeroFormatter.NETCore/1.5.4": {
+      "ZeroFormatter.NETCore/1.5.5": {
         "type": "project",
         "framework": ".NETStandard,Version=v1.6",
         "dependencies": {
@@ -2024,7 +2024,7 @@
           "System.Text.Encoding": "4.0.11",
           "System.Text.Encoding.Extensions": "4.0.11",
           "System.Threading": "4.0.11",
-          "ZeroFormatter.Interfaces.NETCore": "1.5.4"
+          "ZeroFormatter.Interfaces.NETCore": "1.5.5"
         },
         "compile": {
           "netstandard1.6/ZeroFormatter.NETCore.dll": {}
@@ -6627,12 +6627,12 @@
         "ref/xamarinwatchos10/_._"
       ]
     },
-    "ZeroFormatter.Interfaces.NETCore/1.5.4": {
+    "ZeroFormatter.Interfaces.NETCore/1.5.5": {
       "type": "project",
       "path": "../../src/ZeroFormatter.Interfaces.NETCore/project.json",
       "msbuildProject": "../../src/ZeroFormatter.Interfaces.NETCore/ZeroFormatter.Interfaces.NETCore.xproj"
     },
-    "ZeroFormatter.NETCore/1.5.4": {
+    "ZeroFormatter.NETCore/1.5.5": {
       "type": "project",
       "path": "../../src/ZeroFormatter.NETCore/project.json",
       "msbuildProject": "../../src/ZeroFormatter.NETCore/ZeroFormatter.NETCore.xproj"
@@ -6641,8 +6641,8 @@
   "projectFileDependencyGroups": {
     "": [
       "Microsoft.NETCore.App >= 1.0.0",
-      "ZeroFormatter.Interfaces.NETCore >= 1.5.4",
-      "ZeroFormatter.NETCore >= 1.5.4"
+      "ZeroFormatter.Interfaces.NETCore >= 1.5.5",
+      "ZeroFormatter.NETCore >= 1.5.5"
     ],
     ".NETCoreApp,Version=v1.0": []
   },
diff --git a/sandbox/Sandbox.Shared/Properties/AssemblyInfo.cs b/sandbox/Sandbox.Shared/Properties/AssemblyInfo.cs
index 5e022d0..4d58989 100644
--- a/sandbox/Sandbox.Shared/Properties/AssemblyInfo.cs
+++ b/sandbox/Sandbox.Shared/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
diff --git a/sandbox/Sandbox.Shared/Sandbox.Shared.csproj b/sandbox/Sandbox.Shared/Sandbox.Shared.csproj
index 81f11de..93088ec 100644
--- a/sandbox/Sandbox.Shared/Sandbox.Shared.csproj
+++ b/sandbox/Sandbox.Shared/Sandbox.Shared.csproj
@@ -12,6 +12,7 @@
     <TargetFrameworkVersion Condition="'$(Configuration)|$(Platform)' != 'Unity|AnyCPU'">v4.5</TargetFrameworkVersion>
     <TargetFrameworkVersion Condition="'$(Configuration)|$(Platform)' == 'Unity|AnyCPU'">v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -41,8 +42,6 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -59,6 +58,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UnionType.cs" />
     <Compile Include="Versioning.cs" />
+    <Compile Include="ZeroArgument.cs" />
     <Compile Include="ZeroFormatter.Tests\TestClasses.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/sandbox/Sandbox.Shared/ZeroArgument.cs b/sandbox/Sandbox.Shared/ZeroArgument.cs
new file mode 100644
index 0000000..74921af
--- /dev/null
+++ b/sandbox/Sandbox.Shared/ZeroArgument.cs
@@ -0,0 +1,17 @@
+
+using ZeroFormatter;
+
+namespace Sandbox.Shared
+{
+    [ZeroFormattable]
+    public class ZeroClass
+    {
+
+    }
+
+    [ZeroFormattable]
+    public struct ZeroStruct
+    {
+
+    }
+}
diff --git a/sandbox/Sandbox/Program.cs b/sandbox/Sandbox/Program.cs
index d3caae0..8d0d866 100644
--- a/sandbox/Sandbox/Program.cs
+++ b/sandbox/Sandbox/Program.cs
@@ -241,15 +241,18 @@ public class Nest
     }
 
 
+    [ZeroFormattable]
+    public struct ZeroA
+    {
+    }
+
     class Program
     {
         static void Main(string[] args)
         {
-            var a = ZeroFormatterSerializer.Convert(new InnerClassA.InnerObject());
-            var b = ZeroFormatterSerializer.Convert(new InnerClassB.InnerObject());
+            var a = ZeroFormatterSerializer.Serialize(default(ZeroA));
+            
 
-            Console.WriteLine(a.GetType().FullName);
-            Console.WriteLine(b.GetType().FullName);
         }
     }
 
diff --git a/sandbox/Sandbox/Properties/AssemblyInfo.cs b/sandbox/Sandbox/Properties/AssemblyInfo.cs
index 8d6eb56..1c4b12b 100644
--- a/sandbox/Sandbox/Properties/AssemblyInfo.cs
+++ b/sandbox/Sandbox/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
diff --git a/src/ZeroFormatter.Analyzer.Vsix/source.extension.vsixmanifest b/src/ZeroFormatter.Analyzer.Vsix/source.extension.vsixmanifest
index 42ea11d..9742650 100644
--- a/src/ZeroFormatter.Analyzer.Vsix/source.extension.vsixmanifest
+++ b/src/ZeroFormatter.Analyzer.Vsix/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="ZeroFormatterAnalyzer.343bae8e-c880-437c-9e30-748b9e0f9b6e" Version="1.5.4" Language="en-US" Publisher="neuecc"/>
+        <Identity Id="ZeroFormatterAnalyzer.343bae8e-c880-437c-9e30-748b9e0f9b6e" Version="1.5.5" Language="en-US" Publisher="neuecc"/>
         <DisplayName>ZeroFormatterAnalyzer</DisplayName>
         <Description xml:space="preserve">New Launcher of ZeroFormatter.Analyzer</Description>
     </Metadata>
diff --git a/src/ZeroFormatter.CodeGenerator/GeneratorPartial.cs b/src/ZeroFormatter.CodeGenerator/GeneratorPartial.cs
index c4ec367..ce7d8d2 100644
--- a/src/ZeroFormatter.CodeGenerator/GeneratorPartial.cs
+++ b/src/ZeroFormatter.CodeGenerator/GeneratorPartial.cs
@@ -87,6 +87,8 @@ public int[] ElementFixedSizes
         {
             get
             {
+                if (Properties.Length == 0) return new int[0];
+
                 var schemaLastIndex = Properties.Select(x => x.Index).LastOrDefault();
                 var dict = Properties.Where(x => x.IsFixedSize).ToDictionary(x => x.Index, x => x.FixedSize);
                 var elementSizes = new int[schemaLastIndex + 1];
@@ -101,6 +103,20 @@ public int[] ElementFixedSizes
                 return elementSizes;
             }
         }
+
+        public int? GetLength()
+        {
+            if (Properties.Length == 0) return 0;
+            
+            var sum = 0;
+            foreach (var item in Properties)
+            {
+                if (!item.IsFixedSize) return null;
+                sum += item.FixedSize;
+            }
+
+            return sum;
+        }
     }
 
     public partial class InitializerGenerator
diff --git a/src/ZeroFormatter.CodeGenerator/Properties/AssemblyInfo.cs b/src/ZeroFormatter.CodeGenerator/Properties/AssemblyInfo.cs
index d66f194..5303103 100644
--- a/src/ZeroFormatter.CodeGenerator/Properties/AssemblyInfo.cs
+++ b/src/ZeroFormatter.CodeGenerator/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
diff --git a/src/ZeroFormatter.CodeGenerator/StructGenerator.cs b/src/ZeroFormatter.CodeGenerator/StructGenerator.cs
index 59a612c..8e30f0b 100644
--- a/src/ZeroFormatter.CodeGenerator/StructGenerator.cs
+++ b/src/ZeroFormatter.CodeGenerator/StructGenerator.cs
@@ -18,7 +18,7 @@ namespace ZeroFormatter.CodeGenerator
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+    #line 1 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "14.0.0.0")]
     public partial class StructGenerator : StructGeneratorBase
     {
@@ -31,7 +31,7 @@ public virtual string TransformText()
             this.Write("#pragma warning disable 618\r\n#pragma warning disable 612\r\n#pragma warning disable" +
                     " 414\r\n#pragma warning disable 168\r\nnamespace ");
             
-            #line 10 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 10 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
             
             #line default
@@ -40,56 +40,56 @@ public virtual string TransformText()
                     "using global::ZeroFormatter.Internal;\r\n    using global::ZeroFormatter.Segments;" +
                     "\r\n\r\n");
             
-            #line 17 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 17 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
  foreach(var t in Types) {  
             
             #line default
             #line hidden
             this.Write("    public class ");
             
-            #line 18 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 18 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(t.Name));
             
             #line default
             #line hidden
             this.Write("Formatter<TTypeResolver> : Formatter<TTypeResolver, ");
             
-            #line 18 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 18 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(t.FullName));
             
             #line default
             #line hidden
             this.Write(">\r\n        where TTypeResolver : ITypeResolver, new()\r\n    {\r\n");
             
-            #line 21 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 21 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
  for(var i = 0; i < t.Properties.Length; i++) { var p = t.Properties[i]; 
             
             #line default
             #line hidden
             this.Write("        readonly Formatter<TTypeResolver, ");
             
-            #line 22 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 22 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Type));
             
             #line default
             #line hidden
             this.Write("> formatter");
             
-            #line 22 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 22 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(i));
             
             #line default
             #line hidden
             this.Write(";\r\n");
             
-            #line 23 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 23 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("        \r\n");
             
-            #line 25 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 25 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
  if (t.Properties.Length != 0) { 
             
             #line default
@@ -97,63 +97,63 @@ public virtual string TransformText()
             this.Write("        public override bool NoUseDirtyTracker\r\n        {\r\n            get\r\n     " +
                     "       {\r\n                return formatter0.NoUseDirtyTracker\r\n");
             
-            #line 31 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 31 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
  for(var i = 1; i < t.Properties.Length; i++) { var p = t.Properties[i]; 
             
             #line default
             #line hidden
             this.Write("                    && formatter");
             
-            #line 32 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 32 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(i));
             
             #line default
             #line hidden
             this.Write(".NoUseDirtyTracker\r\n");
             
-            #line 33 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 33 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("                ;\r\n            }\r\n        }\r\n");
             
-            #line 37 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 37 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("\r\n        public ");
             
-            #line 39 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 39 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(t.Name));
             
             #line default
             #line hidden
             this.Write("Formatter()\r\n        {\r\n");
             
-            #line 41 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 41 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
  for(var i = 0; i < t.Properties.Length; i++) { var p = t.Properties[i]; 
             
             #line default
             #line hidden
             this.Write("            formatter");
             
-            #line 42 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 42 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(i));
             
             #line default
             #line hidden
             this.Write(" = Formatter<TTypeResolver, ");
             
-            #line 42 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 42 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Type));
             
             #line default
             #line hidden
             this.Write(">.Default;\r\n");
             
-            #line 43 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 43 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
  } 
             
             #line default
@@ -161,50 +161,71 @@ public virtual string TransformText()
             this.Write("            \r\n        }\r\n\r\n        public override int? GetLength()\r\n        {\r\n " +
                     "           return ");
             
-            #line 48 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(t.ElementFixedSizes.Any(x => x == 0)  ? "null" : t.ElementFixedSizes.Sum().ToString()));
+            #line 48 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture((t.GetLength() == null) ? "null" : t.GetLength().ToString()));
             
             #line default
             #line hidden
             this.Write(";\r\n        }\r\n\r\n        public override int Serialize(ref byte[] bytes, int offse" +
                     "t, ");
             
-            #line 51 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 51 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(t.FullName));
             
             #line default
             #line hidden
-            this.Write(" value)\r\n        {\r\n            var startOffset = offset;\r\n");
+            this.Write(" value)\r\n        {\r\n");
             
-            #line 54 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 53 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+ if (t.GetLength() != null) { 
+            
+            #line default
+            #line hidden
+            this.Write("            BinaryUtil.EnsureCapacity(ref bytes, offset, ");
+            
+            #line 54 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(t.GetLength()));
+            
+            #line default
+            #line hidden
+            this.Write(");\r\n");
+            
+            #line 55 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+ } 
+            
+            #line default
+            #line hidden
+            this.Write("            var startOffset = offset;\r\n");
+            
+            #line 57 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
  for(var i = 0; i < t.Properties.Length; i++) { var p = t.Properties[i]; 
             
             #line default
             #line hidden
             this.Write("            offset += formatter");
             
-            #line 55 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 58 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(i));
             
             #line default
             #line hidden
             this.Write(".Serialize(ref bytes, offset, value.");
             
-            #line 55 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 58 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Name));
             
             #line default
             #line hidden
             this.Write(");\r\n");
             
-            #line 56 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 59 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("            return offset - startOffset;\r\n        }\r\n\r\n        public override ");
             
-            #line 60 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 63 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(t.FullName));
             
             #line default
@@ -212,21 +233,21 @@ public virtual string TransformText()
             this.Write(" Deserialize(ref byte[] bytes, int offset, DirtyTracker tracker, out int byteSize" +
                     ")\r\n        {\r\n            byteSize = 0;\r\n            int size;\r\n");
             
-            #line 64 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 67 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
  for(var i = 0; i < t.Properties.Length; i++) { var p = t.Properties[i]; 
             
             #line default
             #line hidden
             this.Write("            var item");
             
-            #line 65 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 68 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(i));
             
             #line default
             #line hidden
             this.Write(" = formatter");
             
-            #line 65 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 68 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(i));
             
             #line default
@@ -234,28 +255,28 @@ public virtual string TransformText()
             this.Write(".Deserialize(ref bytes, offset, tracker, out size);\r\n            offset += size;\r" +
                     "\n            byteSize += size;\r\n");
             
-            #line 68 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 71 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
  } 
             
             #line default
             #line hidden
             this.Write("            \r\n            return new ");
             
-            #line 70 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 73 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(t.FullName));
             
             #line default
             #line hidden
             this.Write("(");
             
-            #line 70 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 73 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(string.Join(", ",  t.Properties.Select((_, i)=> "item" + i).ToArray())));
             
             #line default
             #line hidden
             this.Write(");\r\n        }\r\n    }\r\n\r\n");
             
-            #line 74 "C:\Users\y.kawai\Documents\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
+            #line 77 "C:\Users\neuecc\Documents\Git\neuecc\ZeroFormatter\src\ZeroFormatter.CodeGenerator\StructGenerator.tt"
  } 
             
             #line default
diff --git a/src/ZeroFormatter.CodeGenerator/StructGenerator.tt b/src/ZeroFormatter.CodeGenerator/StructGenerator.tt
index 0d67fb7..bad521e 100644
--- a/src/ZeroFormatter.CodeGenerator/StructGenerator.tt
+++ b/src/ZeroFormatter.CodeGenerator/StructGenerator.tt
@@ -45,11 +45,14 @@ namespace <#= Namespace #>
 
         public override int? GetLength()
         {
-            return <#= t.ElementFixedSizes.Any(x => x == 0)  ? "null" : t.ElementFixedSizes.Sum().ToString() #>;
+            return <#= (t.GetLength() == null) ? "null" : t.GetLength().ToString() #>;
         }
 
         public override int Serialize(ref byte[] bytes, int offset, <#= t.FullName #> value)
         {
+<# if (t.GetLength() != null) { #>
+            BinaryUtil.EnsureCapacity(ref bytes, offset, <#= t.GetLength() #>);
+<# } #>
             var startOffset = offset;
 <# for(var i = 0; i < t.Properties.Length; i++) { var p = t.Properties[i]; #>
             offset += formatter<#= i #>.Serialize(ref bytes, offset, value.<#= p.Name #>);
diff --git a/src/ZeroFormatter.Interfaces.NETCore/project.json b/src/ZeroFormatter.Interfaces.NETCore/project.json
index a258d06..b605ee5 100644
--- a/src/ZeroFormatter.Interfaces.NETCore/project.json
+++ b/src/ZeroFormatter.Interfaces.NETCore/project.json
@@ -1,5 +1,5 @@
 {
-	"version": "1.5.4",
+	"version": "1.5.5",
 	"buildOptions": {
 		"outputName": "ZeroFormatter.Interfaces",
 		"compile": "../ZeroFormatter.Interfaces/*.cs"
diff --git a/src/ZeroFormatter.Interfaces/Properties/AssemblyInfo.cs b/src/ZeroFormatter.Interfaces/Properties/AssemblyInfo.cs
index 4ff1d28..462f355 100644
--- a/src/ZeroFormatter.Interfaces/Properties/AssemblyInfo.cs
+++ b/src/ZeroFormatter.Interfaces/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
diff --git a/src/ZeroFormatter.NETCore/project.json b/src/ZeroFormatter.NETCore/project.json
index 0182b16..0378d37 100644
--- a/src/ZeroFormatter.NETCore/project.json
+++ b/src/ZeroFormatter.NETCore/project.json
@@ -1,5 +1,5 @@
 {
-	"version": "1.5.4",
+	"version": "1.5.5",
 	"buildOptions": {
 		"allowUnsafe": true,
 		"outputName": "ZeroFormatter",
@@ -24,7 +24,7 @@
 		"System.Text.Encoding.Extensions": "4.0.11",
 		"System.Collections.Concurrent": "4.0.12",
 		"System.ObjectModel": "4.0.12",
-		"ZeroFormatter.Interfaces.NETCore": "1.5.4"
+		"ZeroFormatter.Interfaces.NETCore": "1.5.5"
 	},
 	"frameworks": {
 		"netstandard1.6": {
diff --git a/src/ZeroFormatter.NETCore/project.lock.json b/src/ZeroFormatter.NETCore/project.lock.json
index ec7909c..7330e30 100644
--- a/src/ZeroFormatter.NETCore/project.lock.json
+++ b/src/ZeroFormatter.NETCore/project.lock.json
@@ -359,7 +359,7 @@
           "ref/netstandard1.3/System.Threading.Tasks.dll": {}
         }
       },
-      "ZeroFormatter.Interfaces.NETCore/1.5.4": {
+      "ZeroFormatter.Interfaces.NETCore/1.5.5": {
         "type": "project",
         "framework": ".NETStandard,Version=v1.1",
         "dependencies": {
@@ -2001,7 +2001,7 @@
         "ref/xamarinwatchos10/_._"
       ]
     },
-    "ZeroFormatter.Interfaces.NETCore/1.5.4": {
+    "ZeroFormatter.Interfaces.NETCore/1.5.5": {
       "type": "project",
       "path": "../ZeroFormatter.Interfaces.NETCore/project.json",
       "msbuildProject": "../ZeroFormatter.Interfaces.NETCore/ZeroFormatter.Interfaces.NETCore.xproj"
@@ -2023,7 +2023,7 @@
       "System.Text.Encoding >= 4.0.11",
       "System.Text.Encoding.Extensions >= 4.0.11",
       "System.Threading >= 4.0.11",
-      "ZeroFormatter.Interfaces.NETCore >= 1.5.4"
+      "ZeroFormatter.Interfaces.NETCore >= 1.5.5"
     ],
     ".NETStandard,Version=v1.6": []
   },
diff --git a/src/ZeroFormatter/Formatters/DynamicFormatter.cs b/src/ZeroFormatter/Formatters/DynamicFormatter.cs
index e000969..cbea99d 100644
--- a/src/ZeroFormatter/Formatters/DynamicFormatter.cs
+++ b/src/ZeroFormatter/Formatters/DynamicFormatter.cs
@@ -478,10 +478,13 @@ public static object Create<TTypeResolver, T>()
                 constructorTypes.Add(item.Item2.MemberType);
             }
 
-            var info = t.GetTypeInfo().GetConstructor(constructorTypes.ToArray());
-            if (info == null)
+            if (expected != 0)
             {
-                throw new InvalidOperationException("Struct needs full parameter constructor of index property types. Type:" + t.FullName);
+                var info = t.GetTypeInfo().GetConstructor(constructorTypes.ToArray());
+                if (info == null)
+                {
+                    throw new InvalidOperationException("Struct needs full parameter constructor of index property types. Type:" + t.FullName);
+                }
             }
 
             return isNullable ? (int?)null : lengthSum;
@@ -627,45 +630,55 @@ static TypeInfo BuildFormatter(ModuleBuilder builder, Type resolverType, Type el
 
                 var il = method.GetILGenerator();
 
-                il.DeclareLocal(typeof(int)); // size
-                foreach (var item in formattersInField)
+                if (memberInfos.Length != 0)
                 {
-                    il.DeclareLocal(item.Item2.MemberType); // item1, item2...
-                }
-                il.DeclareLocal(elementType); // result
+                    il.DeclareLocal(typeof(int)); // size
+                    foreach (var item in formattersInField)
+                    {
+                        il.DeclareLocal(item.Item2.MemberType); // item1, item2...
+                    }
+                    il.DeclareLocal(elementType); // result
 
-                il.Emit(OpCodes.Ldarg_S, (byte)4);
-                il.Emit(OpCodes.Ldc_I4_0);
-                il.Emit(OpCodes.Stind_I4);
-                foreach (var item in formattersInField)
-                {
-                    il.Emit(OpCodes.Ldarg_0);
-                    il.Emit(OpCodes.Ldfld, item.Item3);
-                    il.Emit(OpCodes.Ldarg_1);
-                    il.Emit(OpCodes.Ldarg_2);
-                    il.Emit(OpCodes.Ldarg_3);
-                    il.Emit(OpCodes.Ldloca_S, (byte)0);
-                    il.Emit(OpCodes.Callvirt, item.Item3.FieldType.GetTypeInfo().GetMethod("Deserialize"));
-                    il.Emit(OpCodes.Stloc, item.Item1 + 1);
-                    il.Emit(OpCodes.Ldarg_2);
-                    il.Emit(OpCodes.Ldloc_0);
-                    il.Emit(OpCodes.Add);
-                    il.Emit(OpCodes.Starg_S, (byte)2);
                     il.Emit(OpCodes.Ldarg_S, (byte)4);
-                    il.Emit(OpCodes.Dup);
-                    il.Emit(OpCodes.Ldind_I4);
-                    il.Emit(OpCodes.Ldloc_0);
-                    il.Emit(OpCodes.Add);
+                    il.Emit(OpCodes.Ldc_I4_0);
                     il.Emit(OpCodes.Stind_I4);
-                }
+                    foreach (var item in formattersInField)
+                    {
+                        il.Emit(OpCodes.Ldarg_0);
+                        il.Emit(OpCodes.Ldfld, item.Item3);
+                        il.Emit(OpCodes.Ldarg_1);
+                        il.Emit(OpCodes.Ldarg_2);
+                        il.Emit(OpCodes.Ldarg_3);
+                        il.Emit(OpCodes.Ldloca_S, (byte)0);
+                        il.Emit(OpCodes.Callvirt, item.Item3.FieldType.GetTypeInfo().GetMethod("Deserialize"));
+                        il.Emit(OpCodes.Stloc, item.Item1 + 1);
+                        il.Emit(OpCodes.Ldarg_2);
+                        il.Emit(OpCodes.Ldloc_0);
+                        il.Emit(OpCodes.Add);
+                        il.Emit(OpCodes.Starg_S, (byte)2);
+                        il.Emit(OpCodes.Ldarg_S, (byte)4);
+                        il.Emit(OpCodes.Dup);
+                        il.Emit(OpCodes.Ldind_I4);
+                        il.Emit(OpCodes.Ldloc_0);
+                        il.Emit(OpCodes.Add);
+                        il.Emit(OpCodes.Stind_I4);
+                    }
+
+                    for (int i = 0; i < memberInfos.Length; i++)
+                    {
+                        il.Emit(OpCodes.Ldloc, i + 1);
+                    }
 
-                for (int i = 0; i < memberInfos.Length; i++)
+                    var constructor = elementType.GetTypeInfo().GetConstructor(memberInfos.Select(x => x.Item2.MemberType).ToArray());
+                    il.Emit(OpCodes.Newobj, constructor);
+                }
+                else
                 {
-                    il.Emit(OpCodes.Ldloc, i + 1);
+                    il.DeclareLocal(elementType);
+                    il.Emit(OpCodes.Ldloca_S, (byte)0);
+                    il.Emit(OpCodes.Initobj, elementType);
+                    il.Emit(OpCodes.Ldloc_0);
                 }
-
-                var constructor = elementType.GetTypeInfo().GetConstructor(memberInfos.Select(x => x.Item2.MemberType).ToArray());
-                il.Emit(OpCodes.Newobj, constructor);
                 il.Emit(OpCodes.Ret);
             }
 
diff --git a/src/ZeroFormatter/Properties/AssemblyInfo.cs b/src/ZeroFormatter/Properties/AssemblyInfo.cs
index 4abbbbb..cdcc39f 100644
--- a/src/ZeroFormatter/Properties/AssemblyInfo.cs
+++ b/src/ZeroFormatter/Properties/AssemblyInfo.cs
@@ -33,10 +33,9 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
 
 
 [assembly: InternalsVisibleTo("ZeroFormatter.Tests")]
-[assembly: InternalsVisibleTo("ZeroFormatter.NETCore.Tests")]
-
+[assembly: InternalsVisibleTo("ZeroFormatter.NETCore.Tests")]
\ No newline at end of file
diff --git a/tests/ZeroFormatter.NETCore.Tests/project.json b/tests/ZeroFormatter.NETCore.Tests/project.json
index 939d35b..756cfe4 100644
--- a/tests/ZeroFormatter.NETCore.Tests/project.json
+++ b/tests/ZeroFormatter.NETCore.Tests/project.json
@@ -1,5 +1,5 @@
 {
-	"version": "1.5.4-*",
+	"version": "1.5.5-*",
 	"testRunner": "xunit",
 	"dependencies": {
 		"Microsoft.CSharp": "4.0.1",
@@ -8,11 +8,11 @@
 		"System.Dynamic.Runtime": "4.0.11",
 		"xunit": "2.2.0-beta3-build3402",
 		"dotnet-test-xunit": "2.2.0-preview2-build1029",
-		"ZeroFormatter.Interfaces.NETCore": "1.5.4",
-		"ZeroFormatter.NETCore": "1.5.4"
+		"ZeroFormatter.Interfaces.NETCore": "1.5.5",
+		"ZeroFormatter.NETCore": "1.5.5"
 	},
 	"frameworks": {
-		"netcoreapp1.5.4": {
+		"netcoreapp1.5.5": {
 			"dependencies": {
 				"Microsoft.NETCore.App": {
 					"type": "platform",
diff --git a/tests/ZeroFormatter.NETCore.Tests/project.lock.json b/tests/ZeroFormatter.NETCore.Tests/project.lock.json
index 71b92a2..a0ba986 100644
--- a/tests/ZeroFormatter.NETCore.Tests/project.lock.json
+++ b/tests/ZeroFormatter.NETCore.Tests/project.lock.json
@@ -2,7 +2,7 @@
   "locked": false,
   "version": 2,
   "targets": {
-    ".NETCoreApp,Version=v1.5.4": {
+    ".NETCoreApp,Version=v1.5.5": {
       "dotnet-test-xunit/2.2.0-preview2-build1029": {
         "type": "package",
         "dependencies": {
@@ -2489,7 +2489,7 @@
           "lib/netstandard1.1/xunit.runner.utility.dotnet.dll": {}
         }
       },
-      "ZeroFormatter.Interfaces.NETCore/1.5.4": {
+      "ZeroFormatter.Interfaces.NETCore/1.5.5": {
         "type": "project",
         "framework": ".NETStandard,Version=v1.1",
         "dependencies": {
@@ -2503,7 +2503,7 @@
           "netstandard1.1/ZeroFormatter.Interfaces.NETCore.dll": {}
         }
       },
-      "ZeroFormatter.NETCore/1.5.4": {
+      "ZeroFormatter.NETCore/1.5.5": {
         "type": "project",
         "framework": ".NETStandard,Version=v1.6",
         "dependencies": {
@@ -2521,7 +2521,7 @@
           "System.Text.Encoding": "4.0.11",
           "System.Text.Encoding.Extensions": "4.0.11",
           "System.Threading": "4.0.11",
-          "ZeroFormatter.Interfaces.NETCore": "1.5.4"
+          "ZeroFormatter.Interfaces.NETCore": "1.5.5"
         },
         "compile": {
           "netstandard1.6/ZeroFormatter.NETCore.dll": {}
@@ -2549,7 +2549,7 @@
       ]
     },
     "Libuv/1.9.0": {
-      "sha512": "ffKMryHi4IlIY5/ua8BLxu9Gg4XeJI9oeA2dxYpx+B1Tle7+hQHaytJWpdGIstau1ZwHlWNLo8WHkuyEQq0Y/g==",
+      "sha512": "9Q7AaqtQhS8JDSIvRBt6ODSLWDBI4c8YxNxyCQemWebBFUtBbc6M5Vi5Gz1ZyIUlTW3rZK9bIr5gnVyv0z7a2Q==",
       "type": "package",
       "path": "Libuv/1.9.0",
       "files": [
@@ -2583,7 +2583,7 @@
       ]
     },
     "Microsoft.CodeAnalysis.Common/1.3.0": {
-      "sha512": "tOLXJaBl7m1EmJJbXb6fhQ2v+jJX/MdWAVqVQUPKy6dRoIqCvM5fQTZ3IcllYQKqchtOZZ0lcwUV6AUUelXLXw==",
+      "sha512": "V09G35cs0CT1C4Dr1IEOh8IGfnWALEVAOO5JXsqagxXwmYR012TlorQ+vx2eXxfZRKs3gAS/r92gN9kRBLba5A==",
       "type": "package",
       "path": "Microsoft.CodeAnalysis.Common/1.3.0",
       "files": [
@@ -2599,7 +2599,7 @@
       ]
     },
     "Microsoft.CodeAnalysis.CSharp/1.3.0": {
-      "sha512": "JvCZOXzzvp0StDvYd7qdzWxPAPpimOft6S7gurx3Jhgivr7uEjQX+Enz2fN20zewRLKS29IGQNW42TfS1sgCLw==",
+      "sha512": "BgWDIAbSFsHuGeLSn/rljLi51nXqkSo4DZ0qEIrHyPVasrhxEVq7aV8KKZ3HEfSFB+GIhBmOogE+mlOLYg19eg==",
       "type": "package",
       "path": "Microsoft.CodeAnalysis.CSharp/1.3.0",
       "files": [
@@ -2615,7 +2615,7 @@
       ]
     },
     "Microsoft.CodeAnalysis.VisualBasic/1.3.0": {
-      "sha512": "XcB34JIO9IUm/6UzD4sIvU8kVbQsa9pi2H9aullGBT+AtNTJngkSLLcu/Tm5ogSg6bEIGDZaIWD8S9PTRjrIkA==",
+      "sha512": "Sf3k8PkTkWqBmXnnblJbvb7ewO6mJzX6WO2t7m04BmOY5qBq6yhhyXnn/BMM+QCec3Arw3X35Zd8f9eBql0qgg==",
       "type": "package",
       "path": "Microsoft.CodeAnalysis.VisualBasic/1.3.0",
       "files": [
@@ -2631,7 +2631,7 @@
       ]
     },
     "Microsoft.CSharp/4.0.1": {
-      "sha512": "hi/fc5f8Od0/6583YiuuuMaDHscsBpvNs5wY6KxaZsYROK+p1ptCszZrHiKcYs6ukB0DCl6E47mt62vsujdWxA==",
+      "sha512": "17h8b5mXa87XYKrrVqdgZ38JefSUqLChUQpXgSnpzsM0nDOhE40FTeNWOJ/YmySGV6tG6T8+hjz6vxbknHJr6A==",
       "type": "package",
       "path": "Microsoft.CSharp/4.0.1",
       "files": [
@@ -2688,7 +2688,7 @@
       ]
     },
     "Microsoft.DiaSymReader/1.0.8": {
-      "sha512": "ABLULVhCAiyBFLBT5xX6vB4NhZDgwUylGRQK+zW5nZn2rbh1f8LOnFZ9gVSxzL6qOzPNb32Nu3QZ43iZerHOxA==",
+      "sha512": "HAhTmRgU+nnDVYxMZFAS1iwqg6CudbsSMZfSY9UJj4AJO4L69xZCtTOPKC5rW8+egNBWjDb0iBZV4ZdNI6dZnA==",
       "type": "package",
       "path": "Microsoft.DiaSymReader/1.0.8",
       "files": [
@@ -2775,7 +2775,7 @@
       ]
     },
     "Microsoft.NETCore.DotNetHost/1.0.1": {
-      "sha512": "x8gKRurLgnu7mwTIJ+nhYfi+BWmh9WW2t9LTmf3ojyGtixiE/5ICHolANOqgHH8pyyieRQnmJ6evDrKud8hznw==",
+      "sha512": "uaMgykq6AckP3hZW4dsD6zjocxyXPz0tcTl8OX7mlSUWsyFXdtf45sjdwI0JIHxt3gnI6GihAlOAwYK8HE4niQ==",
       "type": "package",
       "path": "Microsoft.NETCore.DotNetHost/1.0.1",
       "files": [
@@ -2787,7 +2787,7 @@
       ]
     },
     "Microsoft.NETCore.DotNetHostPolicy/1.0.1": {
-      "sha512": "hmoVszqcZe3nvgkXBZYtr/OSVtj0Iu/omm0oyYs8uo6cJAk/o67RewlcML1IT/inu08hqp65xqIt23CDfX4VWQ==",
+      "sha512": "d8AQ+ZVj2iK9sbgl3IEsshCSaumhM1PNTPHxldZAQLOoI1BKF8QZ1zPCNqwBGisPiWOE3f/1SHDbQi1BTRBxuA==",
       "type": "package",
       "path": "Microsoft.NETCore.DotNetHostPolicy/1.0.1",
       "files": [
@@ -2799,7 +2799,7 @@
       ]
     },
     "Microsoft.NETCore.DotNetHostResolver/1.0.1": {
-      "sha512": "2uVlpIkWsjz8TNRFGmNNgRVF9OMaV0PfM6HpYx4BmYXwhN651GDHyrJj78V3A37F2kXtz+rcq45WvrgkcPkhJQ==",
+      "sha512": "GEXgpAHB9E0OhfcmNJ664Xcd2bJkz2qkGIAFmCgEI5ANlQy4qEEmBVfUqA+Z9HB85ZwWxZc1eIJ6fxdxcjrctg==",
       "type": "package",
       "path": "Microsoft.NETCore.DotNetHostResolver/1.0.1",
       "files": [
@@ -2823,7 +2823,7 @@
       ]
     },
     "Microsoft.NETCore.Platforms/1.0.1": {
-      "sha512": "ziXXtSzmsPhItCe644JETYUqj9Z/R1Zxp8heAox7SI2BYulOpf2SILvPPklKF7oWCXXM2Nwnn/O0ulyPIf8FRA==",
+      "sha512": "2G6OjjJzwBfNOO8myRV/nFrbTw5iA+DEm0N+qUqhrOmaVtn4pC77h38I1jsXGw5VH55+dPfQsqHD0We9sCl9FQ==",
       "type": "package",
       "path": "Microsoft.NETCore.Platforms/1.0.1",
       "files": [
@@ -2848,7 +2848,7 @@
       ]
     },
     "Microsoft.NETCore.Targets/1.0.1": {
-      "sha512": "rBHoVRfvPU6+tqbQK3gPm+19MSCgi5N09g2j/FP+BtHWXIVE9Ta9ShVwZ4IoKa4amH25Ej2RljPMDCAMCvmZxw==",
+      "sha512": "rkn+fKobF/cbWfnnfBOQHKVKIOpxMZBvlSHkqDWgBpwGDcLRduvs3D9OLGeV6GWGvVwNlVi2CBbTjuPmtHvyNw==",
       "type": "package",
       "path": "Microsoft.NETCore.Targets/1.0.1",
       "files": [
@@ -2861,7 +2861,7 @@
       ]
     },
     "Microsoft.NETCore.Windows.ApiSets/1.0.1": {
-      "sha512": "fw6mIMBkSK7C0dX1l1DLEz89yg5JYCzZvldjMvISy5MRlN5omvtW1fVNUmytrWNpZa7XCnbeTmdN28g0CxMNXg==",
+      "sha512": "SaToCvvsGMxTgtLv/BrFQ5IFMPRE1zpWbnqbpwykJa8W5XiX82CXI6K2o7yf5xS7EP6t/JzFLV0SIDuWpvBZVw==",
       "type": "package",
       "path": "Microsoft.NETCore.Windows.ApiSets/1.0.1",
       "files": [
@@ -2873,7 +2873,7 @@
       ]
     },
     "Microsoft.VisualBasic/10.0.1": {
-      "sha512": "S8L4ai9EWZy5RjJufdXvk1b11oosY1dEvE8kEL1aPU2R5r+q/tCGyjObKcetgQVdVM+BoFfIllklbWeL5PxnYw==",
+      "sha512": "HpNyOf/4Tp2lh4FyywB55VITk0SqVxEjDzsVDDyF1yafDN6Bq18xcHowzCPINyYHUTgGcEtmpYiRsFdSo0KKdQ==",
       "type": "package",
       "path": "Microsoft.VisualBasic/10.0.1",
       "files": [
@@ -2916,7 +2916,7 @@
       ]
     },
     "Microsoft.Win32.Primitives/4.0.1": {
-      "sha512": "njuVCBt/kqhTIbXzHBnnaKedWi4nV2gMeRiihvcdsRVjDOeXwSOpWmxqCvg/isVDBYu4RmtW6cYTJlbVayg4RA==",
+      "sha512": "fQnBHO9DgcmkC9dYSJoBqo6sH1VJwJprUHh8F3hbcRlxiQiBUuTntdk8tUwV490OqC2kQUrinGwZyQHTieuXRA==",
       "type": "package",
       "path": "Microsoft.Win32.Primitives/4.0.1",
       "files": [
@@ -2952,7 +2952,7 @@
       ]
     },
     "Microsoft.Win32.Registry/4.0.0": {
-      "sha512": "thlyu/+GxazPaMUU9fDmpuzgRkys9o9plmNi+3ShUOYCr5YZiPGcRqRnqhV239DyEoekfd12TjxLCMAsYkt60g==",
+      "sha512": "q+eLtROUAQ3OxYA5mpQrgyFgzLQxIyrfT2eLpYX5IEPlHmIio2nh4F5bgOaQoGOV865kFKZZso9Oq9RlazvXtg==",
       "type": "package",
       "path": "Microsoft.Win32.Registry/4.0.0",
       "files": [
@@ -2980,7 +2980,7 @@
       ]
     },
     "NETStandard.Library/1.6.0": {
-      "sha512": "VAH/w8exkvtd5sSk+ois/Jsw6FHhAfKpdct6X60S8zqu5z6MXOZYr0kcraDvK1Vst0ubu/s1b4/X8rtxSJmkzA==",
+      "sha512": "ypsCvIdCZ4IoYASJHt6tF2fMo7N30NLgV1EbmC+snO490OMl9FvVxmumw14rhReWU3j3g7BYudG6YCrchwHJlA==",
       "type": "package",
       "path": "NETStandard.Library/1.6.0",
       "files": [
@@ -3108,7 +3108,7 @@
       ]
     },
     "runtime.native.System/4.0.0": {
-      "sha512": "OG/Swe/tlwrbfQnrhy6L6KAIHt0+lGc8+hi55p/eicyMiK1rED1agHxx8DxRM4BU4FKoJuyPYhxo/uMv2dhBMg==",
+      "sha512": "QfS/nQI7k/BLgmLrw7qm7YBoULEvgWnPI+cYsbfCVFTW8Aj+i8JhccxcFMu1RWms0YZzF+UHguNBK4Qn89e2Sg==",
       "type": "package",
       "path": "runtime.native.System/4.0.0",
       "files": [
@@ -3120,7 +3120,7 @@
       ]
     },
     "runtime.native.System.IO.Compression/4.1.0": {
-      "sha512": "DZdatqZEKQ19nnNTW9c2Ox8xrPusPl+ppLFItUmaWqNkGS9A8yaMlGJHwj1GZqIZsgU34Yv6Vaf0OnfhrAkkRw==",
+      "sha512": "Ob7nvnJBox1aaB222zSVZSkf4WrebPG4qFscfK7vmD7P7NxoSxACQLtO7ytWpqXDn2wcd/+45+EAZ7xjaPip8A==",
       "type": "package",
       "path": "runtime.native.System.IO.Compression/4.1.0",
       "files": [
@@ -3132,7 +3132,7 @@
       ]
     },
     "runtime.native.System.Net.Http/4.0.1": {
-      "sha512": "N2GjbcfwPE4WQbG4g7FjUePPxVL8ohbxTTSLY8IP+u6KckE/FEHhqwFtu48JhC6X/FpPscLvIx7S8Fuj4I6TjA==",
+      "sha512": "Nh0UPZx2Vifh8r+J+H2jxifZUD3sBrmolgiFWJd2yiNrxO0xTa6bAw3YwRn1VOiSen/tUXMS31ttNItCZ6lKuA==",
       "type": "package",
       "path": "runtime.native.System.Net.Http/4.0.1",
       "files": [
@@ -3144,7 +3144,7 @@
       ]
     },
     "runtime.native.System.Net.Security/4.0.1": {
-      "sha512": "nZSmDUW1erI4yxC599ll1ZruA4/COOPHxRF2dyz37EkyawO5p4dyaiFkZtqTOck+GTynvUnr8FKiMU42sPQKBQ==",
+      "sha512": "Az6Ff6rZFb8nYGAaejFR6jr8ktt9f3e1Q/yKdw0pwHNTLaO/1eCAC9vzBoR9YAb0QeZD6fZXl1A9tRB5stpzXA==",
       "type": "package",
       "path": "runtime.native.System.Net.Security/4.0.1",
       "files": [
@@ -3156,7 +3156,7 @@
       ]
     },
     "runtime.native.System.Security.Cryptography/4.0.0": {
-      "sha512": "FrtBXxKlWEZTrFVchu5Sq/arPSd/q4XZjXBWx5VkLuL/dDG3GK8LwRd1H5byCs+B4bGPsVjMpfSYuu7NPyQwow==",
+      "sha512": "2CQK0jmO6Eu7ZeMgD+LOFbNJSXHFVQbCJJkEyEwowh1SCgYnrn9W9RykMfpeeVGw7h4IBvYikzpGUlmZTUafJw==",
       "type": "package",
       "path": "runtime.native.System.Security.Cryptography/4.0.0",
       "files": [
@@ -3168,7 +3168,7 @@
       ]
     },
     "System.AppContext/4.1.0": {
-      "sha512": "CaBF8VTPkLnT/0K2LISm9U8j3VdhpE8R642X2hGjjfTORa9EkJsGAok6/PjvKH0mxH3LWD08a2Mdt96VAecahA==",
+      "sha512": "3QjO4jNV7PdKkmQAVp9atA+usVnKRwI3Kx1nMwJ93T0LcQfx7pKAYk0nKz5wn1oP5iqlhZuy6RXOFdhr7rDwow==",
       "type": "package",
       "path": "System.AppContext/4.1.0",
       "files": [
@@ -3221,7 +3221,7 @@
       ]
     },
     "System.Buffers/4.0.0": {
-      "sha512": "GD6BtqKYfxrr1YTNbt6HNOoWlpE931ABxijp1v9qKRslcHi/asdDWnJHKwMNNcAuCw/rAtBY1rZHaCLTkI9mEQ==",
+      "sha512": "msXumHfjjURSkvxUjYuq4N2ghHoRi2VpXcKMA7gK6ujQfU3vGpl+B6ld0ATRg+FZFpRyA6PgEPA+VlIkTeNf2w==",
       "type": "package",
       "path": "System.Buffers/4.0.0",
       "files": [
@@ -3234,7 +3234,7 @@
       ]
     },
     "System.Collections/4.0.11": {
-      "sha512": "YMxntjqEwv32jseVYvtAEjyjr3C94WpAJ29agm84PYMETx3zhQtHiiSWaelj4ad2S7DpGDNQkaEvdU9oYtbhAw==",
+      "sha512": "YUJGz6eFKqS0V//mLt25vFGrrCvOnsXjlvFQs+KimpwNxug9x0Pzy4PlFMU3Q2IzqAa9G2L4LsK3+9vCBK7oTg==",
       "type": "package",
       "path": "System.Collections/4.0.11",
       "files": [
@@ -3300,7 +3300,7 @@
       ]
     },
     "System.Collections.Concurrent/4.0.12": {
-      "sha512": "WPDcgiF85scQSVKlCeL8WLNW9cYNt2eIgQYq8Al9BQ5E0ujJZWXaXuox7n4Ilkfjv4WlYjDNxLy9EWykC0oWsw==",
+      "sha512": "2gBcbb3drMLgxlI0fBfxMA31ec6AEyYCHygGse4vxceJan8mRIWeKJ24BFzN7+bi/NFTgdIgufzb94LWO5EERQ==",
       "type": "package",
       "path": "System.Collections.Concurrent/4.0.12",
       "files": [
@@ -3366,7 +3366,7 @@
       ]
     },
     "System.Collections.Immutable/1.2.0": {
-      "sha512": "H5xnSzWlYd3l/6jSaSkvOobBlsUgMUngGMUcGfKwu3LNUIwbc5wtgNPg/l9DeOMhMoEjR8GnfyXKgEdY9iq8Fw==",
+      "sha512": "Cma8cBW6di16ZLibL8LYQ+cLjGzoKxpOTu/faZfDcx94ZjAGq6Nv5RO7+T1YZXqEXTZP9rt1wLVEONVpURtUqw==",
       "type": "package",
       "path": "System.Collections.Immutable/1.2.0",
       "files": [
@@ -3381,7 +3381,7 @@
       ]
     },
     "System.ComponentModel/4.0.1": {
-      "sha512": "sxkF9jPqub03nqAOpLNNcEn59hHNaB1+CBSnqtP9zvrxDJQsQP3+uzDMC7scKbp9qQrZuRuU3NG6LzZ7kGcU4g==",
+      "sha512": "oBZFnm7seFiVfugsIyOvQCWobNZs7FzqDV/B7tx20Ep/l3UUFCPDkdTnCNaJZTU27zjeODmy2C/cP60u3D4c9w==",
       "type": "package",
       "path": "System.ComponentModel/4.0.1",
       "files": [
@@ -3438,7 +3438,7 @@
       ]
     },
     "System.ComponentModel.Annotations/4.1.0": {
-      "sha512": "MTwDG6Q4umugH3dy2D2F0xTZ3Wbqe1AimhAYCc9LqmVAUMtGyGuFGD3FneipStCNZcKAXZD3ftNVWJaXupzcAg==",
+      "sha512": "rhnz80h8NnHJzoi0nbQJLRR2cJznyqG168q1bgoSpe5qpaME2SguXzuEzpY68nFCi2kBgHpbU4bRN2cP3unYRA==",
       "type": "package",
       "path": "System.ComponentModel.Annotations/4.1.0",
       "files": [
@@ -3515,7 +3515,7 @@
       ]
     },
     "System.Console/4.0.0": {
-      "sha512": "kqeY2G7qrkna1hE/yA0AIlB2QtTM0yd58QVB9XnmFIW8zwFHjwMCNxHSm9M0GmQana4LNArHo720OrQMaBwfdw==",
+      "sha512": "qSKUSOIiYA/a0g5XXdxFcUFmv1hNICBD7QZ0QhGYVipPIhvpiydY8VZqr1thmCXvmn8aipMg64zuanB4eotK9A==",
       "type": "package",
       "path": "System.Console/4.0.0",
       "files": [
@@ -3609,7 +3609,7 @@
       ]
     },
     "System.Diagnostics.Debug/4.0.11": {
-      "sha512": "fogoH0h20awj6DzfmU9Lq4E6Z4NWzdNuM3cxu1HbvFANStkykGiLjkDJZkzsEG/WisRaEDoGR/ZjUdoBRDdB8w==",
+      "sha512": "w5U95fVKHY4G8ASs/K5iK3J5LY+/dLFd4vKejsnI/ZhBsWS9hQakfx3Zr7lRWKg4tAw9r4iktyvsTagWkqYCiw==",
       "type": "package",
       "path": "System.Diagnostics.Debug/4.0.11",
       "files": [
@@ -3675,7 +3675,7 @@
       ]
     },
     "System.Diagnostics.DiagnosticSource/4.0.0": {
-      "sha512": "a9sLhuH6Vi21vt1LMVRVzTsCiQohhNwMcm+vdE+tizqAHRMr19IIGAsAK6LRF/jRBYyP7oPCXapqRgRMh1KONA==",
+      "sha512": "YKglnq4BMTJxfcr6nuT08g+yJ0UxdePIHxosiLuljuHIUR6t4KhFsyaHOaOc1Ofqp0PUvJ0EmcgiEz6T7vEx3w==",
       "type": "package",
       "path": "System.Diagnostics.DiagnosticSource/4.0.0",
       "files": [
@@ -3694,7 +3694,7 @@
       ]
     },
     "System.Diagnostics.FileVersionInfo/4.0.0": {
-      "sha512": "pll0XVuu954GVU45aFPjqZlAuBJVwOKQHjw7Hrlxqum5XW2ay2YuNDl0L8fsKqaMKUw9iakSljCxgD7D4unysg==",
+      "sha512": "qjF74OTAU+mRhLaL4YSfiWy3vj6T3AOz8AW37l5zCwfbBfj0k7E94XnEsRaf2TnhE/7QaV6Hvqakoy2LoV8MVg==",
       "type": "package",
       "path": "System.Diagnostics.FileVersionInfo/4.0.0",
       "files": [
@@ -3734,7 +3734,7 @@
       ]
     },
     "System.Diagnostics.Process/4.1.0": {
-      "sha512": "F1STJGP/H5Orhg2O8RwQLAauFFbhf2V2V91zyDE01rj6Lrp2fD1yIEOAhLOqBieNqPjmujiQGd3dQlTJRw6OuA==",
+      "sha512": "mpVZ5bnlSs3tTeJ6jYyDJEIa6tavhAd88lxq1zbYhkkCu0Pno2+gHXcvZcoygq2d8JxW3gojXqNJMTAshduqZA==",
       "type": "package",
       "path": "System.Diagnostics.Process/4.1.0",
       "files": [
@@ -3789,7 +3789,7 @@
       ]
     },
     "System.Diagnostics.StackTrace/4.0.1": {
-      "sha512": "3q0zUpc8fVh9TcoJXx3i8Z9fqp47rXC9cElEKtUFgmKQ+o3f2V3M9Tcmh31jg/OdpHtoQZGsuCmyGNRfZUsbcQ==",
+      "sha512": "6i2EbRq0lgGfiZ+FDf0gVaw9qeEU+7IS2+wbZJmFVpvVzVOgZEt0ScZtyenuBvs6iDYbGiF51bMAa0oDP/tujQ==",
       "type": "package",
       "path": "System.Diagnostics.StackTrace/4.0.1",
       "files": [
@@ -3827,7 +3827,7 @@
       ]
     },
     "System.Diagnostics.Tools/4.0.1": {
-      "sha512": "vF+yJHxnZQJ06R8ElNbewjiP3OpNCmonLTUm4IIiK/Qg9T2zxuuHLmKhr1EAS520i0jzPT+fkw+b8Tgme44W1A==",
+      "sha512": "xBfJ8pnd4C17dWaC9FM6aShzbJcRNMChUMD42I6772KGGrqaFdumwhn9OdM68erj1ueNo3xdQ1EwiFjK5k8p0g==",
       "type": "package",
       "path": "System.Diagnostics.Tools/4.0.1",
       "files": [
@@ -3882,7 +3882,7 @@
       ]
     },
     "System.Diagnostics.Tracing/4.1.0": {
-      "sha512": "DDKkOTeAmJibX6+mgrQrcqYcxRQwupyxrGOksj5Q1yUa7xxTc/60bQHfDmTFg4G/yfL2ulUGJMoEsQsxqJqHWw==",
+      "sha512": "vDN1PoMZCkkdNjvZLql592oYJZgS7URcJzJ7bxeBgGtx5UtR5leNm49VmfHGqIffX4FKacHbI3H6UyNSHQknBg==",
       "type": "package",
       "path": "System.Diagnostics.Tracing/4.1.0",
       "files": [
@@ -3970,7 +3970,7 @@
       ]
     },
     "System.Dynamic.Runtime/4.0.11": {
-      "sha512": "NBn34bnr/qf23lD+AME9kdmaowzCWd9E0nkiuzv772MFfGizfc/nXjTu/57nIVMIRikufTm70ioOBqy1lg8ysw==",
+      "sha512": "db34f6LHYM0U0JpE+sOmjar27BnqTVkbLJhgfwMpTdgTigG/Hna3m2MYVwnFzGGKnEJk2UXFuoVTr8WUbU91/A==",
       "type": "package",
       "path": "System.Dynamic.Runtime/4.0.11",
       "files": [
@@ -4039,7 +4039,7 @@
       ]
     },
     "System.Globalization/4.0.11": {
-      "sha512": "+jZkiFdUGlI9/uYBPGnN3Rzy5WcxHRC2w18r1NYOXub8RrFBCrYUxs4IOGKgPxQXOoLot+8aNkxdJ5/XPpQ3Ow==",
+      "sha512": "B95h0YLEL2oSnwF/XjqSWKnwKOy/01VWkNlsCeMTFJLLabflpGV26nK164eRs5GiaRSBGpOxQ3pKoSnnyZN5pg==",
       "type": "package",
       "path": "System.Globalization/4.0.11",
       "files": [
@@ -4105,7 +4105,7 @@
       ]
     },
     "System.Globalization.Calendars/4.0.1": {
-      "sha512": "VyH1GvwSnIgANCQqg9LWprzLWvuUsoGpq/XpyQxlGjMMw3F8c/GjLuzbQ9jw1W8IR+BtvvcHtynfPQX162XaIw==",
+      "sha512": "L1c6IqeQ88vuzC1P81JeHmHA8mxq8a18NUBNXnIY/BVb+TCyAaGIFbhpZt60h9FJNmisymoQkHEFSE9Vslja1Q==",
       "type": "package",
       "path": "System.Globalization.Calendars/4.0.1",
       "files": [
@@ -4141,7 +4141,7 @@
       ]
     },
     "System.Globalization.Extensions/4.0.1": {
-      "sha512": "aU8Ate/9kYN9qXx/h8TsqHh7vdtrdp7LnjlfN6D3/95dg1s4x2Ewl02sG+5jOMV0Rvk3LA8PKkoAXOwdgGfrlA==",
+      "sha512": "KKo23iKeOaIg61SSXwjANN7QYDr/3op3OWGGzDzz7mypx0Za0fZSeG0l6cco8Ntp8YMYkIQcAqlk8yhm5/Uhcg==",
       "type": "package",
       "path": "System.Globalization.Extensions/4.0.1",
       "files": [
@@ -4180,7 +4180,7 @@
       ]
     },
     "System.IO/4.1.0": {
-      "sha512": "RbGtdE3hSV9YGVSCidxsROvqAZki+94hn1/fLVLLwl/Cu8+fiZN07VQtxiSO8uP8SG24okhdntza5zXDZxMuQQ==",
+      "sha512": "3KlTJceQc3gnGIaHZ7UBZO26SHL1SHE4ddrmiwumFnId+CEHP+O8r386tZKaE6zlk5/mF8vifMBzHj9SaXN+mQ==",
       "type": "package",
       "path": "System.IO/4.1.0",
       "files": [
@@ -4259,7 +4259,7 @@
       ]
     },
     "System.IO.Compression/4.1.0": {
-      "sha512": "P8kDPVnCydoFkz5SqnGe38KoTvVEbYC8YQu/DE6HI0SGB7XKMdKTVPHBjJ/7t04DO7x0phydHc5atJcgnmwQEw==",
+      "sha512": "TjnBS6eztThSzeSib+WyVbLzEdLKUcEHN69VtS3u8aAsSc18FU6xCZlNWWsEd8SKcXAE+y1sOu7VbU8sUeM0sg==",
       "type": "package",
       "path": "System.IO.Compression/4.1.0",
       "files": [
@@ -4328,7 +4328,7 @@
       ]
     },
     "System.IO.Compression.ZipFile/4.0.1": {
-      "sha512": "X/CXGzjRfZ/4kQT9Ii7vIHJ5H1NWhBrr13cLWcBlEv7wvfbw9IE8MA69/O3SYnkp1VNpoAXvzO+m5idQlByz7Q==",
+      "sha512": "hBQYJzfTbQURF10nLhd+az2NHxsU6MU7AB8RUf4IolBP5lOAm4Luho851xl+CqslmhI5ZH/el8BlngEk4lBkaQ==",
       "type": "package",
       "path": "System.IO.Compression.ZipFile/4.0.1",
       "files": [
@@ -4365,7 +4365,7 @@
       ]
     },
     "System.IO.FileSystem/4.0.1": {
-      "sha512": "bxxdDeyBJqOCiXglEFw/Hwq3qU/GlBBm7G7Kb/pJDJKj4q+EoOGoP4SJOLfqO78DNVRBpOXHRKedqXOoFX0zjQ==",
+      "sha512": "IBErlVq5jOggAD69bg1t0pJcHaDbJbWNUZTPI96fkYWzwYbN6D9wRHMULLDd9dHsl7C2YsxXL31LMfPI1SWt8w==",
       "type": "package",
       "path": "System.IO.FileSystem/4.0.1",
       "files": [
@@ -4401,7 +4401,7 @@
       ]
     },
     "System.IO.FileSystem.Primitives/4.0.1": {
-      "sha512": "rv3N8E0xYOB9kYSELx8YD7HkR0XPeOU/1e9ffn3sEadODN/m+N8/xYUNqRMmuAk9MUo+jOihPlDeH88mFXe1EA==",
+      "sha512": "kWkKD203JJKxJeE74p8aF8y4Qc9r9WQx4C0cHzHPrY3fv/L/IhWnyCHaFJ3H1QPOH6A93whlQ2vG5nHlBDvzWQ==",
       "type": "package",
       "path": "System.IO.FileSystem.Primitives/4.0.1",
       "files": [
@@ -4438,7 +4438,7 @@
       ]
     },
     "System.IO.FileSystem.Watcher/4.0.0": {
-      "sha512": "49iB2v1yLMVlknmXG4YBHKfqbDkGNKrLp1AJfW52+DU36zn/zLQb6xlFphUDw8UjmQAq9OsgN0qvaum4m+iJdA==",
+      "sha512": "qM4Wr3La+RYb/03B0mZZjbA7tHsGzDffnuXP8Sl48HW2JwCjn3kfD5qdw0sqyNNowUipcJMi9/q6sMUrOIJ6UQ==",
       "type": "package",
       "path": "System.IO.FileSystem.Watcher/4.0.0",
       "files": [
@@ -4479,7 +4479,7 @@
       ]
     },
     "System.IO.MemoryMappedFiles/4.0.0": {
-      "sha512": "1FhL5JxF7HnWRj2LIx9JtYOT4gbxTBxNYJk90kcBJEue+PV6L0G8OpmtrFhLr1rePt0JzFBkCjl8UKLV9/IQGQ==",
+      "sha512": "Xqj4xaFAnLVpss9ZSUIvB/VdJAA7GxZDnFGDKJfiGAnZ5VnFROn6eOHWepFpujCYTsh6wlZ3B33bqYkF0QJ7Eg==",
       "type": "package",
       "path": "System.IO.MemoryMappedFiles/4.0.0",
       "files": [
@@ -4519,7 +4519,7 @@
       ]
     },
     "System.IO.UnmanagedMemoryStream/4.0.1": {
-      "sha512": "6GSFgdxnpH+jOmWRClQYKWxGHS2HL+dlrEWwqDLCOx/g5gtiqUmHAowNg1tZq2/Zw3YMydlebgJQ1RGkHnEHhQ==",
+      "sha512": "wcq0kXcpfJwdl1Y4/ZjDk7Dhx5HdLyRYYWYmD8Nn8skoGYYQd2BQWbXwjWSczip8AL4Z57o2dWWXAl4aABAKiQ==",
       "type": "package",
       "path": "System.IO.UnmanagedMemoryStream/4.0.1",
       "files": [
@@ -4556,7 +4556,7 @@
       ]
     },
     "System.Linq/4.1.0": {
-      "sha512": "pqPL9d731Cxd/mLhvvnh/14ZevhthdUUYhZxznZald7Bc6IvaHrr+09vGT5hheKNDjADkAax4PjITcS3SGPY7Q==",
+      "sha512": "bQ0iYFOQI0nuTnt+NQADns6ucV4DUvMdwN6CbkB1yj8i7arTGiTN5eok1kQwdnnNWSDZfIUySQY+J3d5KjWn0g==",
       "type": "package",
       "path": "System.Linq/4.1.0",
       "files": [
@@ -4626,7 +4626,7 @@
       ]
     },
     "System.Linq.Expressions/4.1.0": {
-      "sha512": "H1U+TDcUdzd5jiS/iPW+m3Kw0YzfC7ngeER/uM+ZzikLAJo6fSHBXliIYYMetC+i6D+TZs+cu3Rz7oDED2YVvw==",
+      "sha512": "I+y02iqkgmCAyfbqOmSDOgqdZQ5tTj80Akm5BPSS8EeB0VGWdy6X1KCoYe8Pk6pwDoAKZUOdLVxnTJcExiv5zw==",
       "type": "package",
       "path": "System.Linq.Expressions/4.1.0",
       "files": [
@@ -4708,7 +4708,7 @@
       ]
     },
     "System.Linq.Parallel/4.0.1": {
-      "sha512": "b5YUuX4ZLcl3BVnUI86qItxq6aO+WWmSm2+9wpacB7vopqxUb2Zkaiys6bmAj6IiHWLwT2XysQY3qFCtaMZu5g==",
+      "sha512": "J7XCa7n2cFn32uLbtceXfBFhgCk5M++50lylHKNbqTiJkw5y4Tglpi6amuJNPCvj9bLzNSI7rs1fi4joLMNRgg==",
       "type": "package",
       "path": "System.Linq.Parallel/4.0.1",
       "files": [
@@ -4763,7 +4763,7 @@
       ]
     },
     "System.Linq.Queryable/4.0.1": {
-      "sha512": "o6Ktv4p21x6fZ2YUR7cYcM4arOFd+RFNYy5eAN/9cz1dHfmt1PW7OJLrcgx60umLgU5ykStvupYffRZJx3Dfag==",
+      "sha512": "Yn/WfYe9RoRfmSLvUt2JerP0BTGGykCZkQPgojaxgzF2N0oPo+/AhB8TXOpdCcNlrG3VRtsamtK2uzsp3cqRVw==",
       "type": "package",
       "path": "System.Linq.Queryable/4.0.1",
       "files": [
@@ -4820,7 +4820,7 @@
       ]
     },
     "System.Net.Http/4.1.0": {
-      "sha512": "/2sUDAVTBPKZOmBHLsT5Xxecs3S+Sml1WEGO3ElO5sNiJsSEnGNLL2gt8CWLjPiyIXkQ8Ib+rMFCTvGaUd3Kfg==",
+      "sha512": "ULq9g3SOPVuupt+Y3U+A37coXzdNisB1neFCSKzBwo182u0RDddKJF8I5+HfyXqK6OhJPgeoAwWXrbiUXuRDsg==",
       "type": "package",
       "path": "System.Net.Http/4.1.0",
       "files": [
@@ -4900,7 +4900,7 @@
       ]
     },
     "System.Net.NameResolution/4.0.0": {
-      "sha512": "AYWxZZw5rjxwj+bxEh4vXHezX80TxYP81+H2vaLG87qCxoNo7ahti3X6QlQPOIUTLVqMN1ZoNUbeVcgyDxQJyA==",
+      "sha512": "JdqRdM1Qym3YehqdKIi5LHrpypP4JMfxKQSNCJ2z4WawkG0il+N3XfNeJOxll2XrTnG7WgYYPoeiu/KOwg0DQw==",
       "type": "package",
       "path": "System.Net.NameResolution/4.0.0",
       "files": [
@@ -4940,7 +4940,7 @@
       ]
     },
     "System.Net.Primitives/4.0.11": {
-      "sha512": "azVP3u+2VL2mb8Ec8d8F5l1f68FeK90UJWuiilzvRetPHcT9cHFm86baMLy1Oo7IkzsMXbk9KS56b8eo3lme7Q==",
+      "sha512": "hVvfl4405DRjA2408luZekbPhplJK03j2Y2lSfMlny7GHXlkByw1iLnc9mgKW0GdQn73vvMcWrWewAhylXA4Nw==",
       "type": "package",
       "path": "System.Net.Primitives/4.0.11",
       "files": [
@@ -5017,7 +5017,7 @@
       ]
     },
     "System.Net.Requests/4.0.11": {
-      "sha512": "DzqG4PtZR8w7afsakG30syVaeUz/+xw0+V1z4lMYXowgOIR23maKn2iImlaEXA8Lq2y6JrIJ6bPkLn5qVGu58Q==",
+      "sha512": "vxGt7C0cZixN+VqoSW4Yakc1Y9WknmxauDqzxgpw/FnBdz4kQNN51l4wxdXX5VY1xjqy//+G+4CvJWp1+f+y6Q==",
       "type": "package",
       "path": "System.Net.Requests/4.0.11",
       "files": [
@@ -5098,7 +5098,7 @@
       ]
     },
     "System.Net.Security/4.0.0": {
-      "sha512": "1rjdylFJs4ItNq7zRMxkmkz7du0LZPRCptlK1lZLmML2E3pt3aHK2PUOkaPeGWbt2aNks8bcJuEXN43l9IFjCw==",
+      "sha512": "uM1JaYJciCc2w7efD6du0EpQ1n5ZQqE6/P43/aI4H5E59qvP+wt3l70KIUF/Ha7NaeXGoGNFPVO0MB80pVHk2g==",
       "type": "package",
       "path": "System.Net.Security/4.0.0",
       "files": [
@@ -5138,7 +5138,7 @@
       ]
     },
     "System.Net.Sockets/4.1.0": {
-      "sha512": "JuhDN8RbZV615Sp8gy9+pCJRU9EoifV9WwXY/AER3KYu+PWnKWNOvM1RkeHvg2NNkL9UQs44ZkLaTxDw6uE38w==",
+      "sha512": "xAz0N3dAV/aR/9g8r0Y5oEqU1JRsz29F5EGb/WVHmX3jVSLqi2/92M5hTad2aNWovruXrJpJtgZ9fccPMG9uSw==",
       "type": "package",
       "path": "System.Net.Sockets/4.1.0",
       "files": [
@@ -5174,7 +5174,7 @@
       ]
     },
     "System.Net.WebHeaderCollection/4.0.1": {
-      "sha512": "8xnOyB7k9A+azxBeHVSvsO+vdkB4lk343Rp2wSVCAqVw+aulVbLypJaI+l8BMmizafClTsvLn+tn4eRg/Rkyhg==",
+      "sha512": "XX2TIAN+wBSAIV51BU2FvvXMdstUa8b0FBSZmDWjZdwUMmggQSifpTOZ5fNH20z9ZCg2fkV1L5SsZnpO2RQDRQ==",
       "type": "package",
       "path": "System.Net.WebHeaderCollection/4.0.1",
       "files": [
@@ -5211,7 +5211,7 @@
       ]
     },
     "System.Numerics.Vectors/4.1.1": {
-      "sha512": "2fC5TMXtxybWlCeDHt6DM34xr6JEBPy7kMgZV0ifs/805jSA2Pgw1HUlW6lJsYdXc4RS2+eudKbUfY6CQJkQ2Q==",
+      "sha512": "Ex1NSKycC2wi5XBMWUGWPc3lumh6OQWFFmmpZFZz0oLht5lQ+wWPHVZumOrMJuckfUiVMd4p67BrkBos8lcF+Q==",
       "type": "package",
       "path": "System.Numerics.Vectors/4.1.1",
       "files": [
@@ -5244,7 +5244,7 @@
       ]
     },
     "System.ObjectModel/4.0.12": {
-      "sha512": "XoVo1ZlvAEwUDO+3Lb6WQIxhAw2EivXtWUCOhbKpCfEL/2tcPhSdb3YewlK92ISg7CePCrr4AVGWlVqrwmcUQQ==",
+      "sha512": "tAgJM1xt3ytyMoW4qn4wIqgJYm7L7TShRZG4+Q4Qsi2PCcj96pXN7nRywS9KkB3p/xDUjc2HSwP9SROyPYDYKQ==",
       "type": "package",
       "path": "System.ObjectModel/4.0.12",
       "files": [
@@ -5312,7 +5312,7 @@
       ]
     },
     "System.Reflection/4.1.0": {
-      "sha512": "F0P0/m+3F4/ttA+p+zssY0tXZyGCkCskNW78wTEWb6ulENsWgZq06vD62Jt0ZKVA3zmMwbhm31RWVrGfn/EUYg==",
+      "sha512": "JCKANJ0TI7kzoQzuwB/OoJANy1Lg338B6+JVacPl4TpUwi3cReg3nMLplMq2uqYfHFQpKIlHAUVAJlImZz/4ng==",
       "type": "package",
       "path": "System.Reflection/4.1.0",
       "files": [
@@ -5391,7 +5391,7 @@
       ]
     },
     "System.Reflection.DispatchProxy/4.0.1": {
-      "sha512": "J4RyEonmW5iy86ePqXE9YTM127Hiwzku0yrfpcBPYI4KjUzpmenW13+6uqU8oLA4trviZ7W+wjUH2OrTtif5UA==",
+      "sha512": "GPPgWoSxQEU3aCKSOvsAc1dhTTi4iq92PUVEVfnGPGwqCf6synaAJGYLKMs5E3CuRfel8ufACWUijXqDpOlGrA==",
       "type": "package",
       "path": "System.Reflection.DispatchProxy/4.0.1",
       "files": [
@@ -5427,7 +5427,7 @@
       ]
     },
     "System.Reflection.Emit/4.0.1": {
-      "sha512": "Pttit86IGJ6QzuKzCGRv8UUcg3daTDUeNpPif5XG3cezDCdX2ZxsOTI0Yn6BOt6Mzzh3R06c2B5t7RgMEz0A0g==",
+      "sha512": "P2wqAj72fFjpP6wb9nSfDqNBMab+2ovzSDzUZK7MVIm54tBJEPr9jWfSjjoTpPwj1LeKcmX3vr0ttyjSSFM47g==",
       "type": "package",
       "path": "System.Reflection.Emit/4.0.1",
       "files": [
@@ -5457,7 +5457,7 @@
       ]
     },
     "System.Reflection.Emit.ILGeneration/4.0.1": {
-      "sha512": "zuuSnc6DWaJAFL39C+vxGE01bM0l048+ggV4sVBMk4l69sZwckVwcWbAgEmBwNEnVMY9gPAO0Lz8LDuzl/WVBg==",
+      "sha512": "Ov6dU8Bu15Bc7zuqttgHF12J5lwSWyTf1S+FJouUXVMSqImLZzYaQ+vRr1rQ0OZ0HqsrwWl4dsKHELckQkVpgA==",
       "type": "package",
       "path": "System.Reflection.Emit.ILGeneration/4.0.1",
       "files": [
@@ -5488,7 +5488,7 @@
       ]
     },
     "System.Reflection.Emit.Lightweight/4.0.1": {
-      "sha512": "+KpJnBwqvaRzKp2Lyok8HJW83vwQmkKlAjDazFcz7e3Frihfdg9rfdbbT08FKiJgxhAuBIq+S8l5jtSzTYp6bg==",
+      "sha512": "sSzHHXueZ5Uh0OLpUQprhr+ZYJrLPA2Cmr4gn0wj9+FftNKXx8RIMKvO9qnjk2ebPYUjZ+F2ulGdPOsvj+MEjA==",
       "type": "package",
       "path": "System.Reflection.Emit.Lightweight/4.0.1",
       "files": [
@@ -5519,7 +5519,7 @@
       ]
     },
     "System.Reflection.Extensions/4.0.1": {
-      "sha512": "mFZwg8fwbfBDUn07o1Sa8ax/RuxT95SgG8KTfAdwxbOmLiB66mIlcOOLAmkLWxFLF+Y/cN+rQzL3KOI4sazpFg==",
+      "sha512": "GYrtRsZcMuHF3sbmRHfMYpvxZoIN2bQGrYGerUiWLEkqdEUQZhH3TRSaC/oI4wO0II1RKBPlpIa1TOMxIcOOzQ==",
       "type": "package",
       "path": "System.Reflection.Extensions/4.0.1",
       "files": [
@@ -5574,7 +5574,7 @@
       ]
     },
     "System.Reflection.Metadata/1.3.0": {
-      "sha512": "+hvOXSnnJlOqNnNrSmqQMsIUJnFcEG0BI9azAu0javArlH7RX/LITHFqWRbk22jvf9IRAoQgNGU4WxW8CJvLNg==",
+      "sha512": "jMSCxA4LSyKBGRDm/WtfkO03FkcgRzHxwvQRib1bm2GZ8ifKM1MX1al6breGCEQK280mdl9uQS7JNPXRYk90jw==",
       "type": "package",
       "path": "System.Reflection.Metadata/1.3.0",
       "files": [
@@ -5589,7 +5589,7 @@
       ]
     },
     "System.Reflection.Primitives/4.0.1": {
-      "sha512": "Tfw+FKwG8MXHzf9NmXb+aTmYBRB6NVy+3YlPqXIXJKkJcz6SKTMou3CUy8Yo3nYnnBBY/9FpVYASL7aXwmiGYA==",
+      "sha512": "4inTox4wTBaDhB7V3mPvp9XlCbeGYWVEM9/fXALd52vNEAVisc1BoVWQPuUuD0Ga//dNbA/WeMy9u9mzLxGTHQ==",
       "type": "package",
       "path": "System.Reflection.Primitives/4.0.1",
       "files": [
@@ -5644,7 +5644,7 @@
       ]
     },
     "System.Reflection.TypeExtensions/4.1.0": {
-      "sha512": "V4kH6clDMD+mrKNRPl8Hsunt7dS72gDnaV2mCsynH9CV++qQQ1oz1dGlT/hyk/tqhbnH9R3WCvbrfxt3i/9Omg==",
+      "sha512": "tsQ/ptQ3H5FYfON8lL4MxRk/8kFyE0A+tGPXmVP967cT/gzLHYxIejIYSxp4JmIeFHVP78g/F2FE1mUUTbDtrg==",
       "type": "package",
       "path": "System.Reflection.TypeExtensions/4.1.0",
       "files": [
@@ -5696,7 +5696,7 @@
       ]
     },
     "System.Resources.Reader/4.0.0": {
-      "sha512": "YXRlu2qXzEJOohRpcQSeNzH4zKZJznUt2GPaMPbg2Tjmgb3FdgULDW6KH5s4R6FzDuC9dwfMuiir3I3aGJQZKQ==",
+      "sha512": "VX1iHAoHxgrLZv+nq/9drCZI6Q4SSCzSVyUm1e0U60sqWdj6XhY7wvKmy3RvsSal9h+/vqSWwxxJsm0J4vn/jA==",
       "type": "package",
       "path": "System.Resources.Reader/4.0.0",
       "files": [
@@ -5708,7 +5708,7 @@
       ]
     },
     "System.Resources.ResourceManager/4.0.1": {
-      "sha512": "05XuEYw4Fi5Euxjgidj7YoGFt/X7nkus4pt3t6iXGQFnplygYqK8c8Vx6wuBXdEWqNOOFySivwocjOq/QzgPRg==",
+      "sha512": "TxwVeUNoTgUOdQ09gfTjvW411MF+w9MBYL7AtNVc+HtBCFlutPLhUCdZjNkjbhj3bNQWMdHboF0KIWEOjJssbA==",
       "type": "package",
       "path": "System.Resources.ResourceManager/4.0.1",
       "files": [
@@ -5763,7 +5763,7 @@
       ]
     },
     "System.Runtime/4.1.0": {
-      "sha512": "U7HBTYgTOTyWEMn5uTNH2vnY9eM9g5oUg9x80kPV7tK5dsRmITsM4jysfHB997F1SsdxWOEVO3y2GVN6NrbKyg==",
+      "sha512": "v6c/4Yaa9uWsq+JMhnOFewrYkgdNHNG2eMKuNqRn8P733rNXeRCGvV5FkkjBXn2dbVkPXOsO0xjsEeM1q2zC0g==",
       "type": "package",
       "path": "System.Runtime/4.1.0",
       "files": [
@@ -5853,7 +5853,7 @@
       ]
     },
     "System.Runtime.Extensions/4.1.0": {
-      "sha512": "hdB56Iaitcpagf1tMOyJjZYjRjLX9bBOWVbvnwZREM13SSuY33PP3KEJ0Lf+qc/VpDEWdTFtvZZf3JNtjC+KUw==",
+      "sha512": "CUOHjTT/vgP0qGW22U4/hDlOqXmcPq5YicBaXdUR2UiUoLwBT+olO6we4DVbq57jeX5uXH2uerVZhf0qGj+sVQ==",
       "type": "package",
       "path": "System.Runtime.Extensions/4.1.0",
       "files": [
@@ -5932,7 +5932,7 @@
       ]
     },
     "System.Runtime.Handles/4.0.1": {
-      "sha512": "xr5zx7T8/AMOV7ESKyhGTfEtcabZlwuR/JWBOmirerNvoPpXjh8ALmnET2KraSrem/Z73G2uvOLCzkZ+T1dUAg==",
+      "sha512": "nCJvEKguXEvk2ymk1gqj625vVnlK3/xdGzx0vOKicQkoquaTBJTP13AIYkocSUwHCLNBwUbXTqTWGDxBTWpt7g==",
       "type": "package",
       "path": "System.Runtime.Handles/4.0.1",
       "files": [
@@ -5968,7 +5968,7 @@
       ]
     },
     "System.Runtime.InteropServices/4.1.0": {
-      "sha512": "KHYFnOciZ80k8sYCBam2MLW6nStFSO3sp13r/qE9VjtOh0XX7tfGzYlC4WdbSHv7xnrUhP5tOTgGfHi3E/pYWg==",
+      "sha512": "16eu3kjHS633yYdkjwShDHZLRNMKVi/s0bY8ODiqJ2RfMhDMAwxZaUaWVnZ2P71kr/or+X9o/xFWtNqz8ivieQ==",
       "type": "package",
       "path": "System.Runtime.InteropServices/4.1.0",
       "files": [
@@ -6056,7 +6056,7 @@
       ]
     },
     "System.Runtime.InteropServices.RuntimeInformation/4.0.0": {
-      "sha512": "Ucag7cG05uJiTBLozmFdpc+hGtrnho+70efpZbe7FCxRnKiiBwsV2UEzvbvQebJpTkqkVYWdgtiY76bMOANFQA==",
+      "sha512": "hWPhJxc453RCa8Z29O91EmfGeZIHX1ZH2A8L6lYQVSaKzku2DfArSfMEb1/MYYzPQRJZeu0c9dmYeJKxW5Fgng==",
       "type": "package",
       "path": "System.Runtime.InteropServices.RuntimeInformation/4.0.0",
       "files": [
@@ -6088,7 +6088,7 @@
       ]
     },
     "System.Runtime.Loader/4.0.0": {
-      "sha512": "AoDQLZkH8YL6smgOeiz6ELpzAsVKu5bSRYFo5cIvaWeuvrn8YUuMrWNYAEza/pyImjoHs7VluBCFIN0dMQ2qlA==",
+      "sha512": "4UN78GOVU/mbDFcXkEWtetJT/sJ0yic2gGk1HSlSpWI0TDf421xnrZTDZnwNBapk1GQeYN7U1lTj/aQB1by6ow==",
       "type": "package",
       "path": "System.Runtime.Loader/4.0.0",
       "files": [
@@ -6112,7 +6112,7 @@
       ]
     },
     "System.Runtime.Numerics/4.0.1": {
-      "sha512": "GpLudrrjyJx1P299ApQlbDqRSZrb5IGYhVA4LbkBb2W6XkS8XLqkh0/MB8rO+K+UevqEWVIk2iozqcBs4AjOKQ==",
+      "sha512": "+XbKFuzdmLP3d1o9pdHu2nxjNr2OEPqGzKeegPLCUMM71a0t50A/rOcIRmGs9wR7a8KuHX6hYs/7/TymIGLNqg==",
       "type": "package",
       "path": "System.Runtime.Numerics/4.0.1",
       "files": [
@@ -6238,7 +6238,7 @@
       ]
     },
     "System.Security.Claims/4.0.1": {
-      "sha512": "YDR5L/0iLtZ7XCcVODwaQz8uaYcIPJbDqSAjLytgE7g1xMbF9up1U31I1mxTnuXnSqthG/szI5jZs5wYrcEblg==",
+      "sha512": "4Jlp0OgJLS/Voj1kyFP6MJlIYp3crgfH8kNQk2p7+4JYfc1aAmh9PZyAMMbDhuoolGNtux9HqSOazsioRiDvCw==",
       "type": "package",
       "path": "System.Security.Claims/4.0.1",
       "files": [
@@ -6275,7 +6275,7 @@
       ]
     },
     "System.Security.Cryptography.Algorithms/4.2.0": {
-      "sha512": "UbTgdmBFVAtuWo5uCVaDkDB2atFwDoQi9wsmU/hR5IvFLPoM/dwQaWgxccFTVDEtLkfwqPnDjquSZTs4Q6hkUA==",
+      "sha512": "8JQFxbLVdrtIOKMDN38Fn0GWnqYZw/oMlwOUG/qz1jqChvyZlnUmu+0s7wLx7JYua/nAXoESpHA3iw11QFWhXg==",
       "type": "package",
       "path": "System.Security.Cryptography.Algorithms/4.2.0",
       "files": [
@@ -6313,7 +6313,7 @@
       ]
     },
     "System.Security.Cryptography.Cng/4.2.0": {
-      "sha512": "YIjR/aaQx08gUwcpndE7YnEiW7VwHRvh8qlMJixek5JFU+MToyQzrFukRASF1eihKfXJws1vZqnwstCtphPldQ==",
+      "sha512": "cUJ2h+ZvONDe28Szw3st5dOHdjndhJzQ2WObDEXAWRPEQBtVItVoxbXM/OEsTthl3cNn2dk2k0I3y45igCQcLw==",
       "type": "package",
       "path": "System.Security.Cryptography.Cng/4.2.0",
       "files": [
@@ -6339,7 +6339,7 @@
       ]
     },
     "System.Security.Cryptography.Csp/4.0.0": {
-      "sha512": "SZ7atTNsSTehQSGf/FaJgoku8cYpvVlnBQzmW+4sYoBkGzbase1ZiXJXGqqGiMjxQfnTIqy5S45IlRQfcytHVg==",
+      "sha512": "/i1Usuo4PgAqgbPNC0NjbO3jPW//BoBlTpcWFD1EHVbidH21y4c1ap5bbEMSGAXjAShhMH4abi/K8fILrnu4BQ==",
       "type": "package",
       "path": "System.Security.Cryptography.Csp/4.0.0",
       "files": [
@@ -6369,7 +6369,7 @@
       ]
     },
     "System.Security.Cryptography.Encoding/4.0.0": {
-      "sha512": "X+kOpzoJBUoTvVhLOwLTjRxBilJSHv7jxkpGbGuzi1Y6I3TPMowGmM5gyEXoY9abCbbQebnRBvoEp0B02tjDww==",
+      "sha512": "FbKgE5MbxSQMPcSVRgwM6bXN3GtyAh04NkV8E5zKCBE26X0vYW0UtTa2FIgkH33WVqBVxRgxljlVYumWtU+HcQ==",
       "type": "package",
       "path": "System.Security.Cryptography.Encoding/4.0.0",
       "files": [
@@ -6408,7 +6408,7 @@
       ]
     },
     "System.Security.Cryptography.OpenSsl/4.0.0": {
-      "sha512": "eiJH14SMf+j8rsi3EEe/lCKKRHzcP6p2WneGeleL38gjkLFwrXlyMnP9ZLYUI5zrqnXuzinPkg1Zl54+zrMqhw==",
+      "sha512": "HUG/zNUJwEiLkoURDixzkzZdB5yGA5pQhDP93ArOpDPQMteURIGERRNzzoJlmTreLBWr5lkFSjjMSk8ySEpQMw==",
       "type": "package",
       "path": "System.Security.Cryptography.OpenSsl/4.0.0",
       "files": [
@@ -6422,7 +6422,7 @@
       ]
     },
     "System.Security.Cryptography.Primitives/4.0.0": {
-      "sha512": "PSKkHdg0PNjWRcuPlazsnUnoUDTDoUtFbWOyk8mXkkLwndXdD0L+1obCzvejUGeIplsJGktQEpTylF7qfoMV6Q==",
+      "sha512": "Wkd7QryWYjkQclX0bngpntW5HSlMzeJU24UaLJQ7YTfI8ydAVAaU2J+HXLLABOVJlKTVvAeL0Aj39VeTe7L+oA==",
       "type": "package",
       "path": "System.Security.Cryptography.Primitives/4.0.0",
       "files": [
@@ -6449,7 +6449,7 @@
       ]
     },
     "System.Security.Cryptography.X509Certificates/4.1.0": {
-      "sha512": "/jRCc9g1sGm3L8ACwKoyuJawBHLoECVxtKZVTK8lYx5z3Qalm21znnK+H0U+b/3wKaAKcAIp5FaThksSvnxCsw==",
+      "sha512": "4HEfsQIKAhA1+ApNn729Gi09zh+lYWwyIuViihoMDWp1vQnEkL2ct7mAbhBlLYm+x/L4Rr/pyGge1lIY635e0w==",
       "type": "package",
       "path": "System.Security.Cryptography.X509Certificates/4.1.0",
       "files": [
@@ -6503,7 +6503,7 @@
       ]
     },
     "System.Security.Principal/4.0.1": {
-      "sha512": "BIo5E20Ad0mLrYU7EcAKRtbws5hwdnPBOtdG9PJSTuzT7hK9dKvtoU3XZS7SuFBQGsRA0oAFRwscAwSMmA+r3A==",
+      "sha512": "On+SKhXY5rzxh/S8wlH1Rm0ogBlu7zyHNxeNBiXauNrhHRXAe9EuX8Yl5IOzLPGU5Z4kLWHMvORDOCG8iu9hww==",
       "type": "package",
       "path": "System.Security.Principal/4.0.1",
       "files": [
@@ -6560,7 +6560,7 @@
       ]
     },
     "System.Security.Principal.Windows/4.0.0": {
-      "sha512": "i0DBY6Hu8XaRyiZ7Kb68aaOpsTL0jnu1H1op1iT50QDvRkqY7u8c+EUpkoFEERRT5X6lSmtVWNSKe7PA/4TGfg==",
+      "sha512": "iFx15AF3RMEPZn3COh8+Bb2Thv2zsmLd93RchS1b8Mj5SNYeGqbYNCSn5AES1+gq56p4ujGZPrl0xN7ngkXOHg==",
       "type": "package",
       "path": "System.Security.Principal.Windows/4.0.0",
       "files": [
@@ -6587,7 +6587,7 @@
       ]
     },
     "System.Text.Encoding/4.0.11": {
-      "sha512": "SDjobpd+BG187ZrWlxK1YLFiyhMNPU9Z/XOGUvtGgaB6Qabpmg51gw8Tf8bRGKW3+HNKWkQnHoaM0Z/hU9Z3dg==",
+      "sha512": "U3gGeMlDZXxCEiY4DwVLSacg+DFWCvoiX+JThA/rvw37Sqrku7sEFeVBBBMBnfB6FeZHsyDx85HlKL19x0HtZA==",
       "type": "package",
       "path": "System.Text.Encoding/4.0.11",
       "files": [
@@ -6653,7 +6653,7 @@
       ]
     },
     "System.Text.Encoding.CodePages/4.0.1": {
-      "sha512": "PAxg0CsNfxlM/khFRdC2+j+E5XW/XI+rbbRotNp7xOjL7UpWm/O0iG5+fLX8SXbLKFWeiCq97wx+HpwQr3P8Hw==",
+      "sha512": "h4z6rrA/hxWf4655D18IIZ0eaLRa3tQC/j+e26W+VinIHY0l07iEXaAvO0YSYq3MvCjMYy8Zs5AdC1sxNQOB7Q==",
       "type": "package",
       "path": "System.Text.Encoding.CodePages/4.0.1",
       "files": [
@@ -6690,7 +6690,7 @@
       ]
     },
     "System.Text.Encoding.Extensions/4.0.11": {
-      "sha512": "Q0KXG6s+mkLUrX+RU1p2gOfmIVncEmhP0rSV/1OF0CUcduFgC9bJ1bf0Qbr5LYaKtRa39UpYMybhSLTiNT9W4A==",
+      "sha512": "jtbiTDtvfLYgXn8PTfWI+SiBs51rrmO4AAckx4KR6vFK9Wzf6tI8kcRdsYQNwriUeQ1+CtQbM1W4cMbLXnj/OQ==",
       "type": "package",
       "path": "System.Text.Encoding.Extensions/4.0.11",
       "files": [
@@ -6756,7 +6756,7 @@
       ]
     },
     "System.Text.RegularExpressions/4.1.0": {
-      "sha512": "NkczdJ8q7lImE6HnlcOm3wZChdZLrmIK1GjrfkTtluaptdOcNYB5NBhSarRY+hNoPSp1k8lEiSPZ3i6OmX7dhA==",
+      "sha512": "i88YCXpRTjCnoSQZtdlHkAOx4KNNik4hMy83n0+Ftlb7jvV6ZiZWMpnEZHhjBp6hQVh8gWd/iKNPzlPF7iyA2g==",
       "type": "package",
       "path": "System.Text.RegularExpressions/4.1.0",
       "files": [
@@ -6837,7 +6837,7 @@
       ]
     },
     "System.Threading/4.0.11": {
-      "sha512": "MgVya+4/1Ab8/JJB5F5XPGf9XzM2e+hdm9VeUhTLE19IEhf36v9zQdvwhrlFB4QzeRZMOM7LeWh1uZgHIJAgkg==",
+      "sha512": "N+3xqIcg3VDKyjwwCGaZ9HawG9aC6cSDI+s7ROma310GQo8vilFZa86hqKppwTHleR/G0sfOzhvgnUxWCR/DrQ==",
       "type": "package",
       "path": "System.Threading/4.0.11",
       "files": [
@@ -6906,7 +6906,7 @@
       ]
     },
     "System.Threading.Overlapped/4.0.1": {
-      "sha512": "SuqMzSNo33pBNlPmy8TlqfA21wngZz5idg3B7xunA3rWvobAMTUHl1hUcyJZzX1Lqx/hacKNzCz1a2a8924IzA==",
+      "sha512": "f7aLuLkBoCQM2kng7zqLFBXz9Gk48gDK8lk1ih9rH/1arJJzZK9gJwNvPDhL6Ps/l6rwOr8jw+4FCHL0KKWiEg==",
       "type": "package",
       "path": "System.Threading.Overlapped/4.0.1",
       "files": [
@@ -6934,7 +6934,7 @@
       ]
     },
     "System.Threading.Tasks/4.0.11": {
-      "sha512": "8cbSSCQk2gkgQJH7l8ih1cs1I8qXMOd28i/xJjuvUNGfomvIcPk93f26LBd7BVDANAT40byye9T5Zur5Dj1SRg==",
+      "sha512": "k1S4Gc6IGwtHGT8188RSeGaX86Qw/wnrgNLshJvsdNUOPP9etMmo8S07c+UlOAx4K/xLuN9ivA1bD0LVurtIxQ==",
       "type": "package",
       "path": "System.Threading.Tasks/4.0.11",
       "files": [
@@ -7000,7 +7000,7 @@
       ]
     },
     "System.Threading.Tasks.Dataflow/4.6.0": {
-      "sha512": "eLGrGsrcbDzmoToWfv8ZivOVI4Uyy/boeNlWLS8tvRjWLRSHGNgegfk4/2XvRTdA7O8aoIG9QsQhw4BeCNpd+Q==",
+      "sha512": "2hRjGu2r2jxRZ55wmcHO/WbdX+YAOz9x6FE8xqkHZgPaoFMKQZRe9dk8xTZIas8fRjxRmzawnTEWIrhlM+Un7w==",
       "type": "package",
       "path": "System.Threading.Tasks.Dataflow/4.6.0",
       "files": [
@@ -7015,7 +7015,7 @@
       ]
     },
     "System.Threading.Tasks.Extensions/4.0.0": {
-      "sha512": "o6Y9j43hzMaSFKzQipn9QXqzKJvMmESqv++d7Tjyxt2DBml3UYjXGrou3pJ4N7lYOodPElJRLdGsR7oW7Tp47w==",
+      "sha512": "pH4FZDsZQ/WmgJtN4LWYmRdJAEeVkyriSwrv2Teoe5FOU0Yxlb6II6GL8dBPOfRmutHGATduj3ooMt7dJ2+i+w==",
       "type": "package",
       "path": "System.Threading.Tasks.Extensions/4.0.0",
       "files": [
@@ -7030,7 +7030,7 @@
       ]
     },
     "System.Threading.Tasks.Parallel/4.0.1": {
-      "sha512": "ZsEVXlSYVln9Da4jkx8cMIzBFAca4UskJw/mF5x+7NwsEXUa2yBSc1Oiv6jBbyYfcKGuPOBcuXrIbCD+ywoLiw==",
+      "sha512": "7Pc9t25bcynT9FpMvkUw4ZjYwUiGup/5cJFW72/5MgCG+np2cfVUMdh29u8d7onxX7d8PS3J+wL73zQRqkdrSA==",
       "type": "package",
       "path": "System.Threading.Tasks.Parallel/4.0.1",
       "files": [
@@ -7085,7 +7085,7 @@
       ]
     },
     "System.Threading.Thread/4.0.0": {
-      "sha512": "7cBMjhi9yuj9zFjZCrMCfZuB/97yD2/M2Qyp/QCrwIRq426j8rAceO/Zzc/lryGDENXN34K/laNN++ljBH3gRg==",
+      "sha512": "gIdJqDXlOr5W9zeqFErLw3dsOsiShSCYtF9SEHitACycmvNvY8odf9kiKvp6V7aibc8C4HzzNBkWXjyfn7plbQ==",
       "type": "package",
       "path": "System.Threading.Thread/4.0.0",
       "files": [
@@ -7123,7 +7123,7 @@
       ]
     },
     "System.Threading.ThreadPool/4.0.10": {
-      "sha512": "x9K2eTbcrSuVG8tEnhVw2xI2rSE9CzqeGOwrpoq1a7zdwt0iwSqZHxFv4sDlG0rC48VzSILynneXUyo650UTQw==",
+      "sha512": "IMXgB5Vf/5Qw1kpoVgJMOvUO1l32aC+qC3OaIZjWJOjvcxuxNWOK2ZTWWYXfij22NHxT2j1yWX5vlAeQWld9vA==",
       "type": "package",
       "path": "System.Threading.ThreadPool/4.0.10",
       "files": [
@@ -7161,7 +7161,7 @@
       ]
     },
     "System.Threading.Timer/4.0.1": {
-      "sha512": "+nxHdP3jtquJ8CeLLipEsq28/PHCgzrUAyajtKJddrkLedOeaXChO/K3jgXQmzIhfEbKwkSJ/VSraoo6qKdrRg==",
+      "sha512": "saGfUV8uqVW6LeURiqxcGhZ24PzuRNaUBtbhVeuUAvky1naH395A/1nY0P2bWvrw/BreRtIB/EzTDkGBpqCwEw==",
       "type": "package",
       "path": "System.Threading.Timer/4.0.1",
       "files": [
@@ -7214,7 +7214,7 @@
       ]
     },
     "System.Xml.ReaderWriter/4.0.11": {
-      "sha512": "zmnLW/M+S5PybSqnjykpAMZv95jDTu+LVekwTBhdLf9iyyEgRlIvJ68KdcaGYiXL7Pz9ZryMXvHeK0pcLxf5yA==",
+      "sha512": "ZIiLPsf67YZ9zgr31vzrFaYQqxRPX9cVHjtPSnmx4eN6lbS/yEyYNr2vs1doGDEscF0tjCZFsk9yUg1sC9e8tg==",
       "type": "package",
       "path": "System.Xml.ReaderWriter/4.0.11",
       "files": [
@@ -7282,7 +7282,7 @@
       ]
     },
     "System.Xml.XDocument/4.0.11": {
-      "sha512": "3JZocfmL8XIKh8AIObHSgFQYG2RNw0BFYhsf63YWPZGysRtXdUlXSsAcsZDSARI+BIZDNnbJE1EN9WHyxjWWkg==",
+      "sha512": "Mk2mKmPi0nWaoiYeotq1dgeNK1fqWh61+EK+w4Wu8SWuTYLzpUnschb59bJtGywaPq7SmTuPf44wrXRwbIrukg==",
       "type": "package",
       "path": "System.Xml.XDocument/4.0.11",
       "files": [
@@ -7350,7 +7350,7 @@
       ]
     },
     "System.Xml.XmlDocument/4.0.1": {
-      "sha512": "RrePj+Se+IW3586+jpaB44k1n7BHodjrjTkeQIvD4BKT477DGXlLcXspVG7UfrFXlswm4RXD4tD/c3POVN8BDg==",
+      "sha512": "2eZu6IP+etFVBBFUFzw2w6J21DqIN5eL9Y8r8JfJWUmV28Z5P0SNU01oCisVHQgHsDhHPnmq2s1hJrJCFZWloQ==",
       "type": "package",
       "path": "System.Xml.XmlDocument/4.0.1",
       "files": [
@@ -7387,7 +7387,7 @@
       ]
     },
     "System.Xml.XPath/4.0.1": {
-      "sha512": "EjubP5LEwFNGLe0mq2mQO3Y5oundsXAUTUsiJide8RfB1xwlGoka05XzyFZqMua/Q9Pxyoentx/isncbfz548Q==",
+      "sha512": "UWd1H+1IJ9Wlq5nognZ/XJdyj8qPE4XufBUkAW59ijsCPjZkZe0MUzKKJFBr+ZWBe5Wq1u1d5f2CYgE93uH7DA==",
       "type": "package",
       "path": "System.Xml.XPath/4.0.1",
       "files": [
@@ -7424,7 +7424,7 @@
       ]
     },
     "System.Xml.XPath.XDocument/4.0.1": {
-      "sha512": "kdQ7SDlXZllPsowFZJO34m3WJqthMYEU1hZeGL+gZ6loA8n3kU0uLP5fRlfYj314MF1y0hWcRbGwnP/XWQI97g==",
+      "sha512": "FLhdYJx4331oGovQypQ8JIw2kEmNzCsjVOVYY/16kZTUoquZG85oVn7yUhBE2OZt1yGPSXAL0HTEfzjlbNpM7Q==",
       "type": "package",
       "path": "System.Xml.XPath.XDocument/4.0.1",
       "files": [
@@ -7573,12 +7573,12 @@
         "xunit.runner.utility.nuspec"
       ]
     },
-    "ZeroFormatter.Interfaces.NETCore/1.5.4": {
+    "ZeroFormatter.Interfaces.NETCore/1.5.5": {
       "type": "project",
       "path": "../../src/ZeroFormatter.Interfaces.NETCore/project.json",
       "msbuildProject": "../../src/ZeroFormatter.Interfaces.NETCore/ZeroFormatter.Interfaces.NETCore.xproj"
     },
-    "ZeroFormatter.NETCore/1.5.4": {
+    "ZeroFormatter.NETCore/1.5.5": {
       "type": "project",
       "path": "../../src/ZeroFormatter.NETCore/project.json",
       "msbuildProject": "../../src/ZeroFormatter.NETCore/ZeroFormatter.NETCore.xproj"
@@ -7590,12 +7590,12 @@
       "NETStandard.Library >= 1.6.0",
       "System.Diagnostics.Contracts >= 4.0.1",
       "System.Dynamic.Runtime >= 4.0.11",
-      "ZeroFormatter.Interfaces.NETCore >= 1.5.4",
-      "ZeroFormatter.NETCore >= 1.5.4",
+      "ZeroFormatter.Interfaces.NETCore >= 1.5.5",
+      "ZeroFormatter.NETCore >= 1.5.5",
       "dotnet-test-xunit >= 2.2.0-preview2-build1029",
       "xunit >= 2.2.0-beta3-build3402"
     ],
-    ".NETCoreApp,Version=v1.5.4": [
+    ".NETCoreApp,Version=v1.5.5": [
       "Microsoft.NETCore.App >= 1.0.1"
     ]
   },
diff --git a/tests/ZeroFormatter.Tests/Properties/AssemblyInfo.cs b/tests/ZeroFormatter.Tests/Properties/AssemblyInfo.cs
index dbd6284..e825cdf 100644
--- a/tests/ZeroFormatter.Tests/Properties/AssemblyInfo.cs
+++ b/tests/ZeroFormatter.Tests/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
diff --git a/tests/ZeroFormatter.Tests/ZeroArgumentTest.cs b/tests/ZeroFormatter.Tests/ZeroArgumentTest.cs
index 25819b8..4e35c0a 100644
--- a/tests/ZeroFormatter.Tests/ZeroArgumentTest.cs
+++ b/tests/ZeroFormatter.Tests/ZeroArgumentTest.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using ZeroFormatter.Formatters;
 
 namespace ZeroFormatter.Tests
 {
@@ -32,6 +33,9 @@ public void Class()
         public void Struct()
         {
             ZeroFormatterSerializer.Convert(new ZeroStruct()).IsInstanceOf<ZeroStruct>();
+            var len = ZeroFormatter.Formatters.Formatter<DefaultResolver, ZeroStruct>.Default.GetLength();
+            len.IsNotNull();
+            len.Is(0);
         }
     }
 }
diff --git a/tests/ZeroFormatter.UnityTests/Assets/Dlls/Sandbox.Shared.dll b/tests/ZeroFormatter.UnityTests/Assets/Dlls/Sandbox.Shared.dll
index 1fc8a88..82e5a58 100644
Binary files a/tests/ZeroFormatter.UnityTests/Assets/Dlls/Sandbox.Shared.dll and b/tests/ZeroFormatter.UnityTests/Assets/Dlls/Sandbox.Shared.dll differ
diff --git a/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.Interfaces.dll b/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.Interfaces.dll
index 2abd482..fe283c7 100644
Binary files a/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.Interfaces.dll and b/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.Interfaces.dll differ
diff --git a/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.dll b/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.dll
index 3725054..1150f25 100644
Binary files a/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.dll and b/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.dll differ
diff --git a/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.dll.mdb b/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.dll.mdb
index 1a44255..6a97d33 100644
Binary files a/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.dll.mdb and b/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.dll.mdb differ
diff --git a/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.dll.mdb.meta b/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.dll.mdb.meta
index e555987..c2e9697 100644
--- a/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.dll.mdb.meta
+++ b/tests/ZeroFormatter.UnityTests/Assets/Dlls/ZeroFormatter.dll.mdb.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 6566771a98c11044faa809b981041651
-timeCreated: 1480947889
+timeCreated: 1481456229
 licenseType: Pro
 DefaultImporter:
   userData: 
diff --git a/tests/ZeroFormatter.UnityTests/Assets/Scripts/Tests/ZeroArgumentTest.cs b/tests/ZeroFormatter.UnityTests/Assets/Scripts/Tests/ZeroArgumentTest.cs
new file mode 100644
index 0000000..ab2357a
--- /dev/null
+++ b/tests/ZeroFormatter.UnityTests/Assets/Scripts/Tests/ZeroArgumentTest.cs
@@ -0,0 +1,28 @@
+using Sandbox.Shared;
+using System;
+using RuntimeUnitTestToolkit;
+
+using ZeroFormatter.Formatters;
+
+namespace ZeroFormatter.Tests
+{
+    public class ZeroArgumentTest
+    {
+        public void Class()
+        {
+            var c = ZeroFormatterSerializer.Convert(new ZeroClass());
+            (c is ZeroClass).IsTrue();
+        }
+
+        public void Struct()
+        {
+            var bytes = ZeroFormatterSerializer.Serialize(new ZeroStruct());
+            bytes.Length.Is(0);
+            ZeroFormatterSerializer.Deserialize<ZeroStruct>(bytes);
+
+            var len = ZeroFormatter.Formatters.Formatter<DefaultResolver, ZeroStruct>.Default.GetLength();
+            len.IsNotNull();
+            len.Is(0);
+        }
+    }
+}
diff --git a/tests/ZeroFormatter.UnityTests/Assets/Scripts/Tests/ZeroArgumentTest.cs.meta b/tests/ZeroFormatter.UnityTests/Assets/Scripts/Tests/ZeroArgumentTest.cs.meta
new file mode 100644
index 0000000..3f27c15
--- /dev/null
+++ b/tests/ZeroFormatter.UnityTests/Assets/Scripts/Tests/ZeroArgumentTest.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 92ac8bbeeef8b5142a10bdea89edc70d
+timeCreated: 1481449820
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/tests/ZeroFormatter.UnityTests/Assets/Scripts/Tests/_UnitTestLoader.cs b/tests/ZeroFormatter.UnityTests/Assets/Scripts/Tests/_UnitTestLoader.cs
index 92349eb..08b41fb 100644
--- a/tests/ZeroFormatter.UnityTests/Assets/Scripts/Tests/_UnitTestLoader.cs
+++ b/tests/ZeroFormatter.UnityTests/Assets/Scripts/Tests/_UnitTestLoader.cs
@@ -29,6 +29,7 @@ public static void Register()
             UnitTest.RegisterAllMethods<EqualityCompTest>();
             UnitTest.RegisterAllMethods<SequenceTest>();
             UnitTest.RegisterAllMethods<UnionTest>();
+            UnitTest.RegisterAllMethods<ZeroArgumentTest>();
 
             UnitTest.RegisterAllMethods<PerformanceTest>();
         }
diff --git a/tests/ZeroFormatter.UnityTests/Assets/ZeroFormatterGenerated.cs b/tests/ZeroFormatter.UnityTests/Assets/ZeroFormatterGenerated.cs
index aa3082d..96bc8bf 100644
--- a/tests/ZeroFormatter.UnityTests/Assets/ZeroFormatterGenerated.cs
+++ b/tests/ZeroFormatter.UnityTests/Assets/ZeroFormatterGenerated.cs
@@ -149,6 +149,7 @@ public static void Register()
             ZeroFormatter.Formatters.Formatter<ZeroFormatter.Formatters.DefaultResolver, global::Sandbox.Shared.EventB>.Register(new ZeroFormatter.DynamicObjectSegments.Sandbox.Shared.EventBFormatter<ZeroFormatter.Formatters.DefaultResolver>());
             ZeroFormatter.Formatters.Formatter<ZeroFormatter.Formatters.DefaultResolver, global::Sandbox.Shared.Standard>.Register(new ZeroFormatter.DynamicObjectSegments.Sandbox.Shared.StandardFormatter<ZeroFormatter.Formatters.DefaultResolver>());
             ZeroFormatter.Formatters.Formatter<ZeroFormatter.Formatters.DefaultResolver, global::Sandbox.Shared.Large>.Register(new ZeroFormatter.DynamicObjectSegments.Sandbox.Shared.LargeFormatter<ZeroFormatter.Formatters.DefaultResolver>());
+            ZeroFormatter.Formatters.Formatter<ZeroFormatter.Formatters.DefaultResolver, global::Sandbox.Shared.ZeroClass>.Register(new ZeroFormatter.DynamicObjectSegments.Sandbox.Shared.ZeroClassFormatter<ZeroFormatter.Formatters.DefaultResolver>());
             ZeroFormatter.Formatters.Formatter<ZeroFormatter.Formatters.DefaultResolver, global::Sandbox.Shared.Bar.StaticProperty>.Register(new ZeroFormatter.DynamicObjectSegments.Sandbox.Shared.Bar.StaticPropertyFormatter<ZeroFormatter.Formatters.DefaultResolver>());
             ZeroFormatter.Formatters.Formatter<ZeroFormatter.Formatters.DefaultResolver, global::Sandbox.Shared.Bar.DameClass>.Register(new ZeroFormatter.DynamicObjectSegments.Sandbox.Shared.Bar.DameClassFormatter<ZeroFormatter.Formatters.DefaultResolver>());
             ZeroFormatter.Formatters.Formatter<ZeroFormatter.Formatters.DefaultResolver, global::Sandbox.Shared.Bar.MyClass>.Register(new ZeroFormatter.DynamicObjectSegments.Sandbox.Shared.Bar.MyClassFormatter<ZeroFormatter.Formatters.DefaultResolver>());
@@ -205,6 +206,11 @@ public static void Register()
                 ZeroFormatter.Formatters.Formatter<ZeroFormatter.Formatters.DefaultResolver, global::UnityEngine.Vector3>.Register(structFormatter);
                 ZeroFormatter.Formatters.Formatter<ZeroFormatter.Formatters.DefaultResolver, global::UnityEngine.Vector3?>.Register(new global::ZeroFormatter.Formatters.NullableStructFormatter<ZeroFormatter.Formatters.DefaultResolver, global::UnityEngine.Vector3>(structFormatter));
             }
+            {
+                var structFormatter = new ZeroFormatter.DynamicObjectSegments.Sandbox.Shared.ZeroStructFormatter<ZeroFormatter.Formatters.DefaultResolver>();
+                ZeroFormatter.Formatters.Formatter<ZeroFormatter.Formatters.DefaultResolver, global::Sandbox.Shared.ZeroStruct>.Register(structFormatter);
+                ZeroFormatter.Formatters.Formatter<ZeroFormatter.Formatters.DefaultResolver, global::Sandbox.Shared.ZeroStruct?>.Register(new global::ZeroFormatter.Formatters.NullableStructFormatter<ZeroFormatter.Formatters.DefaultResolver, global::Sandbox.Shared.ZeroStruct>(structFormatter));
+            }
             // Unions
             {
                 var unionFormatter = new ZeroFormatter.DynamicObjectSegments.Sandbox.Shared.CharacterFormatter<ZeroFormatter.Formatters.DefaultResolver>();
@@ -2324,7 +2330,7 @@ public override int Serialize(ref byte[] bytes, int offset, global::Sandbox.Shar
     public class UnknownMessage1ObjectSegment<TTypeResolver> : global::Sandbox.Shared.UnknownMessage1, IZeroFormatterSegment
         where TTypeResolver : ITypeResolver, new()
     {
-        static readonly int[] __elementSizes = new int[]{ 0 };
+        static readonly int[] __elementSizes = new int[]{  };
 
         readonly ArraySegment<byte> __originalBytes;
         readonly DirtyTracker __tracker;
@@ -2417,7 +2423,7 @@ public override int Serialize(ref byte[] bytes, int offset, global::Sandbox.Shar
     public class MessageA1ObjectSegment<TTypeResolver> : global::Sandbox.Shared.MessageA1, IZeroFormatterSegment
         where TTypeResolver : ITypeResolver, new()
     {
-        static readonly int[] __elementSizes = new int[]{ 0 };
+        static readonly int[] __elementSizes = new int[]{  };
 
         readonly ArraySegment<byte> __originalBytes;
         readonly DirtyTracker __tracker;
@@ -2510,7 +2516,7 @@ public override int Serialize(ref byte[] bytes, int offset, global::Sandbox.Shar
     public class MessageB1ObjectSegment<TTypeResolver> : global::Sandbox.Shared.MessageB1, IZeroFormatterSegment
         where TTypeResolver : ITypeResolver, new()
     {
-        static readonly int[] __elementSizes = new int[]{ 0 };
+        static readonly int[] __elementSizes = new int[]{  };
 
         readonly ArraySegment<byte> __originalBytes;
         readonly DirtyTracker __tracker;
@@ -2603,7 +2609,7 @@ public override int Serialize(ref byte[] bytes, int offset, global::Sandbox.Shar
     public class MessageAObjectSegment<TTypeResolver> : global::Sandbox.Shared.MessageA, IZeroFormatterSegment
         where TTypeResolver : ITypeResolver, new()
     {
-        static readonly int[] __elementSizes = new int[]{ 0 };
+        static readonly int[] __elementSizes = new int[]{  };
 
         readonly ArraySegment<byte> __originalBytes;
         readonly DirtyTracker __tracker;
@@ -2807,7 +2813,7 @@ public override int Serialize(ref byte[] bytes, int offset, global::Sandbox.Shar
     public class UnknownEventObjectSegment<TTypeResolver> : global::Sandbox.Shared.UnknownEvent, IZeroFormatterSegment
         where TTypeResolver : ITypeResolver, new()
     {
-        static readonly int[] __elementSizes = new int[]{ 0 };
+        static readonly int[] __elementSizes = new int[]{  };
 
         readonly ArraySegment<byte> __originalBytes;
         readonly DirtyTracker __tracker;
@@ -2900,7 +2906,7 @@ public override int Serialize(ref byte[] bytes, int offset, global::Sandbox.Shar
     public class EventAObjectSegment<TTypeResolver> : global::Sandbox.Shared.EventA, IZeroFormatterSegment
         where TTypeResolver : ITypeResolver, new()
     {
-        static readonly int[] __elementSizes = new int[]{ 0 };
+        static readonly int[] __elementSizes = new int[]{  };
 
         readonly ArraySegment<byte> __originalBytes;
         readonly DirtyTracker __tracker;
@@ -2993,7 +2999,7 @@ public override int Serialize(ref byte[] bytes, int offset, global::Sandbox.Shar
     public class EventBObjectSegment<TTypeResolver> : global::Sandbox.Shared.EventB, IZeroFormatterSegment
         where TTypeResolver : ITypeResolver, new()
     {
-        static readonly int[] __elementSizes = new int[]{ 0 };
+        static readonly int[] __elementSizes = new int[]{  };
 
         readonly ArraySegment<byte> __originalBytes;
         readonly DirtyTracker __tracker;
@@ -3404,6 +3410,99 @@ public int Serialize(ref byte[] targetBytes, int offset)
         }
     }
 
+    public class ZeroClassFormatter<TTypeResolver> : Formatter<TTypeResolver, global::Sandbox.Shared.ZeroClass>
+        where TTypeResolver : ITypeResolver, new()
+    {
+        public override int? GetLength()
+        {
+            return null;
+        }
+
+        public override int Serialize(ref byte[] bytes, int offset, global::Sandbox.Shared.ZeroClass value)
+        {
+            var segment = value as IZeroFormatterSegment;
+            if (segment != null)
+            {
+                return segment.Serialize(ref bytes, offset);
+            }
+            else if (value == null)
+            {
+                BinaryUtil.WriteInt32(ref bytes, offset, -1);
+                return 4;
+            }
+            else
+            {
+                var startOffset = offset;
+
+                offset += (8 + 4 * (0 + 1));
+
+                return ObjectSegmentHelper.WriteSize(ref bytes, startOffset, offset, 0);
+            }
+        }
+
+        public override global::Sandbox.Shared.ZeroClass Deserialize(ref byte[] bytes, int offset, DirtyTracker tracker, out int byteSize)
+        {
+            byteSize = BinaryUtil.ReadInt32(ref bytes, offset);
+            if (byteSize == -1)
+            {
+                byteSize = 4;
+                return null;
+            }
+            return new ZeroClassObjectSegment<TTypeResolver>(tracker, new ArraySegment<byte>(bytes, offset, byteSize));
+        }
+    }
+
+    public class ZeroClassObjectSegment<TTypeResolver> : global::Sandbox.Shared.ZeroClass, IZeroFormatterSegment
+        where TTypeResolver : ITypeResolver, new()
+    {
+        static readonly int[] __elementSizes = new int[]{  };
+
+        readonly ArraySegment<byte> __originalBytes;
+        readonly DirtyTracker __tracker;
+        readonly int __binaryLastIndex;
+        readonly byte[] __extraFixedBytes;
+
+
+
+        public ZeroClassObjectSegment(DirtyTracker dirtyTracker, ArraySegment<byte> originalBytes)
+        {
+            var __array = originalBytes.Array;
+
+            this.__originalBytes = originalBytes;
+            this.__tracker = dirtyTracker = dirtyTracker.CreateChild();
+            this.__binaryLastIndex = BinaryUtil.ReadInt32(ref __array, originalBytes.Offset + 4);
+
+            this.__extraFixedBytes = ObjectSegmentHelper.CreateExtraFixedBytes(this.__binaryLastIndex, 0, __elementSizes);
+
+        }
+
+        public bool CanDirectCopy()
+        {
+            return !__tracker.IsDirty;
+        }
+
+        public ArraySegment<byte> GetBufferReference()
+        {
+            return __originalBytes;
+        }
+
+        public int Serialize(ref byte[] targetBytes, int offset)
+        {
+            if (__extraFixedBytes != null || __tracker.IsDirty)
+            {
+                var startOffset = offset;
+                offset += (8 + 4 * (0 + 1));
+
+
+                return ObjectSegmentHelper.WriteSize(ref targetBytes, startOffset, offset, 0);
+            }
+            else
+            {
+                return ObjectSegmentHelper.DirectCopyAll(__originalBytes, ref targetBytes, offset);
+            }
+        }
+    }
+
 
 }
 
@@ -7096,6 +7195,7 @@ public MyStructFixedFormatter()
 
         public override int Serialize(ref byte[] bytes, int offset, global::ZeroFormatter.Tests.MyStructFixed value)
         {
+            BinaryUtil.EnsureCapacity(ref bytes, offset, 16);
             var startOffset = offset;
             offset += formatter0.Serialize(ref bytes, offset, value.MyProperty1);
             offset += formatter1.Serialize(ref bytes, offset, value.MyProperty2);
@@ -7209,6 +7309,7 @@ public MyVectorFormatter()
 
         public override int Serialize(ref byte[] bytes, int offset, global::ZeroFormatter.Tests.MyVector value)
         {
+            BinaryUtil.EnsureCapacity(ref bytes, offset, 8);
             var startOffset = offset;
             offset += formatter0.Serialize(ref bytes, offset, value.X);
             offset += formatter1.Serialize(ref bytes, offset, value.Y);
@@ -7329,6 +7430,7 @@ public Vector2Formatter()
 
         public override int Serialize(ref byte[] bytes, int offset, global::UnityEngine.Vector2 value)
         {
+            BinaryUtil.EnsureCapacity(ref bytes, offset, 8);
             var startOffset = offset;
             offset += formatter0.Serialize(ref bytes, offset, value.x);
             offset += formatter1.Serialize(ref bytes, offset, value.y);
@@ -7383,6 +7485,7 @@ public Vector3Formatter()
 
         public override int Serialize(ref byte[] bytes, int offset, global::UnityEngine.Vector3 value)
         {
+            BinaryUtil.EnsureCapacity(ref bytes, offset, 12);
             var startOffset = offset;
             offset += formatter0.Serialize(ref bytes, offset, value.x);
             offset += formatter1.Serialize(ref bytes, offset, value.y);
@@ -7409,6 +7512,55 @@ public override int Serialize(ref byte[] bytes, int offset, global::UnityEngine.
     }
 
 
+}
+
+#pragma warning restore 168
+#pragma warning restore 414
+#pragma warning restore 618
+#pragma warning restore 612
+#pragma warning disable 618
+#pragma warning disable 612
+#pragma warning disable 414
+#pragma warning disable 168
+namespace ZeroFormatter.DynamicObjectSegments.Sandbox.Shared
+{
+    using global::System;
+    using global::ZeroFormatter.Formatters;
+    using global::ZeroFormatter.Internal;
+    using global::ZeroFormatter.Segments;
+
+    public class ZeroStructFormatter<TTypeResolver> : Formatter<TTypeResolver, global::Sandbox.Shared.ZeroStruct>
+        where TTypeResolver : ITypeResolver, new()
+    {
+        
+
+        public ZeroStructFormatter()
+        {
+            
+        }
+
+        public override int? GetLength()
+        {
+            return 0;
+        }
+
+        public override int Serialize(ref byte[] bytes, int offset, global::Sandbox.Shared.ZeroStruct value)
+        {
+            BinaryUtil.EnsureCapacity(ref bytes, offset, 0);
+            var startOffset = offset;
+            return offset - startOffset;
+        }
+
+        public override global::Sandbox.Shared.ZeroStruct Deserialize(ref byte[] bytes, int offset, DirtyTracker tracker, out int byteSize)
+        {
+            byteSize = 0;
+            int size;
+            
+            return new global::Sandbox.Shared.ZeroStruct();
+        }
+    }
+
+
 }
 
 #pragma warning restore 168
diff --git a/tests/ZeroFormatter.UnityTests/Assets/gmcs.rsp.meta b/tests/ZeroFormatter.UnityTests/Assets/gmcs.rsp.meta
new file mode 100644
index 0000000..3b0932f
--- /dev/null
+++ b/tests/ZeroFormatter.UnityTests/Assets/gmcs.rsp.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 631bf9ff825f88749a6053db7da167c2
+timeCreated: 1479614683
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/tests/ZeroFormatter.UnityTests/Assets/smcs.rsp.meta b/tests/ZeroFormatter.UnityTests/Assets/smcs.rsp.meta
new file mode 100644
index 0000000..b6f765a
--- /dev/null
+++ b/tests/ZeroFormatter.UnityTests/Assets/smcs.rsp.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0c6648bcba41cde4dbc4c8de6e677327
+timeCreated: 1479614638
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/tests/ZeroFormatter.UnityTests/ZeroFormatter.UnityTests.CSharp.csproj b/tests/ZeroFormatter.UnityTests/ZeroFormatter.UnityTests.CSharp.csproj
index 6ff7bd2..f3c3edd 100644
--- a/tests/ZeroFormatter.UnityTests/ZeroFormatter.UnityTests.CSharp.csproj
+++ b/tests/ZeroFormatter.UnityTests/ZeroFormatter.UnityTests.CSharp.csproj
@@ -13,14 +13,13 @@
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
-    <CompilerResponseFile>
-    </CompilerResponseFile>
+    <CompilerResponseFile>Assets\smcs.rsp</CompilerResponseFile>
     <UnityProjectType>Game:1</UnityProjectType>
-    <UnityBuildTarget>StandaloneWindows:5</UnityBuildTarget>
-    <UnityVersion>5.4.0p2</UnityVersion>
+    <UnityBuildTarget>Android:13</UnityBuildTarget>
+    <UnityVersion>5.4.0f3</UnityVersion>
     <RootNamespace>
     </RootNamespace>
-    <LangVersion Condition=" '$(VisualStudioVersion)' != '10.0' ">4</LangVersion>
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,8 +28,8 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Debug\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_0;UNITY_5_4;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_0;UNITY_5_4;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_TEXTUREID_MAP;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;DEVELOPMENT_BUILD;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;unsafe;</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -39,8 +38,8 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Release\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_0;UNITY_5_4;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_0;UNITY_5_4;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_TEXTUREID_MAP;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;DEVELOPMENT_BUILD;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;unsafe;</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
@@ -63,6 +62,9 @@
     <Reference Include="UnityEditor">
       <HintPath>Library\UnityAssemblies\UnityEditor.dll</HintPath>
     </Reference>
+    <Reference Include="Mono.Cecil">
+      <HintPath>Library\UnityAssemblies\Mono.Cecil.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEditor.iOS.Extensions.Xcode">
       <HintPath>Library\UnityAssemblies\UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
     </Reference>
@@ -90,13 +92,14 @@
     <Compile Include="Assets\Scripts\RuntimeUnitTestToolkit\Assert.cs" />
     <Compile Include="Assets\Scripts\RuntimeUnitTestToolkit\ChainingAssertion.Unity.cs" />
     <Compile Include="Assets\Scripts\RuntimeUnitTestToolkit\UnitTestRunner.cs" />
-    <Compile Include="Assets\Scripts\Tests\EqualityCompTest.cs" />
+    <Compile Include="Assets\Scripts\Tests\ZeroArgumentTest.cs" />
     <Compile Include="Assets\Scripts\TestUtils\Shim.cs" />
     <Compile Include="Assets\Scripts\TestUtils\Tuple.cs" />
     <Compile Include="Assets\Scripts\Tests\BinatyUtilTest.cs" />
     <Compile Include="Assets\Scripts\Tests\BlockSerializeTest.cs" />
     <Compile Include="Assets\Scripts\Tests\DictionaryFormatterTest.cs" />
     <Compile Include="Assets\Scripts\Tests\DictionarySegmentTest.cs" />
+    <Compile Include="Assets\Scripts\Tests\EqualityCompTest.cs" />
     <Compile Include="Assets\Scripts\Tests\FormatterTest.cs" />
     <Compile Include="Assets\Scripts\Tests\InheritanceTest.cs" />
     <Compile Include="Assets\Scripts\Tests\KeyTupleFormatterTest.cs" />