diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
index 3ca4a3892..7272f1ede 100644
--- a/LibGit2Sharp/LibGit2Sharp.csproj
+++ b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -38,6 +38,12 @@
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <DocumentationFile>bin\Release\LibGit2Sharp.xml</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>key.snk.pfx</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -350,6 +356,9 @@
   <ItemGroup>
     <EmbeddedResource Include="libgit2sharp_hash.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="key.snk.pfx" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="UniqueIdentifier.targets" />
   <PropertyGroup>
diff --git a/LibGit2Sharp/Properties/AssemblyInfo.cs b/LibGit2Sharp/Properties/AssemblyInfo.cs
index b848dc65a..22e050b5a 100644
--- a/LibGit2Sharp/Properties/AssemblyInfo.cs
+++ b/LibGit2Sharp/Properties/AssemblyInfo.cs
@@ -44,4 +44,4 @@
 
 [assembly: AssemblyVersion("0.22.0")]
 [assembly: AssemblyFileVersion("0.22.0")]
-[assembly: AssemblyInformationalVersion("0.22.0-dev00000000000000")]
+[assembly: AssemblyInformationalVersion("0.22.0-pre03212015012115")]
diff --git a/LibGit2Sharp/TreeChanges.cs b/LibGit2Sharp/TreeChanges.cs
index 1529a25cd..28bcd8691 100644
--- a/LibGit2Sharp/TreeChanges.cs
+++ b/LibGit2Sharp/TreeChanges.cs
@@ -64,7 +64,10 @@ private void AddFileChange(GitDiffDelta delta)
             var treeEntryChanges = new TreeEntryChanges(delta);
 
             fileDispatcher[treeEntryChanges.Status](this, treeEntryChanges);
-            changes.Add(treeEntryChanges.Path, treeEntryChanges);
+            if (!changes.ContainsKey(treeEntryChanges.Path))
+            {
+                changes.Add(treeEntryChanges.Path, treeEntryChanges);
+            }
         }
 
         #region IEnumerable<TreeEntryChanges> Members
diff --git a/LibGit2Sharp/key.snk.pfx b/LibGit2Sharp/key.snk.pfx
new file mode 100644
index 000000000..6dcb85abd
Binary files /dev/null and b/LibGit2Sharp/key.snk.pfx differ