diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..1ff0c423
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain
diff --git a/.gitignore b/.gitignore
index 24d532c7..d2afc62c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,14 +4,14 @@ docs/output
 src/bin
 src/obj
 *.suo
-tests/FSharp.DataFrame.Tests/obj
-tests/FSharp.DataFrame.Tests/bin
-tests/FSharp.DataFrame.Documentation.Tests/obj
-tests/FSharp.DataFrame.Documentation.Tests/bin
-tests/FSharp.DataFrame.CSharp.Tests/obj
-tests/FSharp.DataFrame.CSharp.Tests/bin
-tests/FSharp.DataFrame.Tests.Console/obj
-tests/FSharp.DataFrame.Tests.Console/bin
+tests/Deedle.Tests/obj
+tests/Deedle.Tests/bin
+tests/Deedle.Documentation.Tests/obj
+tests/Deedle.Documentation.Tests/bin
+tests/Deedle.CSharp.Tests/obj
+tests/Deedle.CSharp.Tests/bin
+tests/Deedle.Tests.Console/obj
+tests/Deedle.Tests.Console/bin
 packages/*
 *.vsp
 TestResults.xml
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 31f0d93f..7c936d5f 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,4 +1,5 @@
 * 0.9.0-beta - Initial release
 * 0.9.1-beta - First beta version on NuGet
 * 0.9.2-beta - Update paths in NuGet package
-* 0.9.3-beta - Saving CSV, fix series alignment
\ No newline at end of file
+* 0.9.3-beta - Saving CSV, fix series alignment
+* 0.9.4-beta - Rename and various fixes and additions
\ No newline at end of file
diff --git a/nuget/Deedle.nuspec b/nuget/Deedle.nuspec
index 1a12369d..ccd6d1a8 100644
--- a/nuget/Deedle.nuspec
+++ b/nuget/Deedle.nuspec
@@ -5,9 +5,9 @@
     <version>@build.number@</version>
     <authors>@authors@</authors>
     <owners>@authors@</owners>
-    <licenseUrl>http://github.com/BlueMountainCapital/FSharp.DataFrame/blob/master/LICENSE.md</licenseUrl>
-    <projectUrl>http://BlueMountainCapital.github.com/FSharp.DataFrame</projectUrl>
-    <iconUrl>https://raw.github.com/BlueMountainCapital/FSharp.DataFrame/master/misc/logo.png</iconUrl>
+    <licenseUrl>http://github.com/BlueMountainCapital/Deedle/blob/master/LICENSE.md</licenseUrl>
+    <projectUrl>http://BlueMountainCapital.github.com/Deedle</projectUrl>
+    <iconUrl>https://raw.github.com/BlueMountainCapital/Deedle/master/misc/logo.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>@summary@</summary>
     <description>@description@</description>
@@ -19,9 +19,8 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="..\bin\FSharp.DataFrame.dll" target="lib/net40" />
-    <file src="..\bin\FSharp.DataFrame.pdb" target="lib/net40" />
-    <file src="..\bin\FSharp.DataFrame.xml" target="lib/net40" />
-    <file src="..\bin\FSharp.DataFrame.fsx" target="." />
+    <file src="..\bin\Deedle.dll" target="lib/net40" />
+    <file src="..\bin\Deedle.pdb" target="lib/net40" />
+    <file src="..\bin\Deedle.xml" target="lib/net40" />
   </files>
 </package>
diff --git a/src/Common/AssemblyInfo.fs b/src/Common/AssemblyInfo.fs
index 7be35eb3..3a5835e0 100644
--- a/src/Common/AssemblyInfo.fs
+++ b/src/Common/AssemblyInfo.fs
@@ -3,8 +3,8 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("Deedle")>]
 [<assembly: AssemblyProductAttribute("Deedle")>]
-[<assembly: AssemblyDescriptionAttribute("Easy to use F# library for data manipulation and scientific programming")>]
-[<assembly: AssemblyVersionAttribute("0.9.3")>]
-[<assembly: AssemblyFileVersionAttribute("0.9.3")>]
+[<assembly: AssemblyDescriptionAttribute("Easy to use .NET library for data manipulation and scientific programming")>]
+[<assembly: AssemblyVersionAttribute("0.9.4")>]
+[<assembly: AssemblyFileVersionAttribute("0.9.4")>]
 
 ()
diff --git a/src/Frame.fs b/src/Frame.fs
index f5fda4fa..7eb510ff 100644
--- a/src/Frame.fs
+++ b/src/Frame.fs
@@ -811,7 +811,7 @@ and FrameUtils =
                 v.TryGetObject(key) |> OptionalValue.asOption)
             let someValue = defaultArg someValue (obj())
             columnCreator key someValue
-          with :? System.InvalidCastException ->
+          with :? System.InvalidCastException | :? System.FormatException ->
             // If that failes, the sequence is heterogeneous
             // so we try again and pass object as a witness
             columnCreator key (obj()) )
diff --git a/tests/Deedle.CSharp.Tests/Deedle.CSharp.Tests.csproj b/tests/Deedle.CSharp.Tests/Deedle.CSharp.Tests.csproj
index 52f9971c..4dbf9109 100644
--- a/tests/Deedle.CSharp.Tests/Deedle.CSharp.Tests.csproj
+++ b/tests/Deedle.CSharp.Tests/Deedle.CSharp.Tests.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{B0584275-6E9D-4DB8-A35D-4F37B623F97E}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FSharp.DataFrame.CSharp.Tests</RootNamespace>
-    <AssemblyName>FSharp.DataFrame.CSharp.Tests</AssemblyName>
+    <RootNamespace>Deedle.CSharp.Tests</RootNamespace>
+    <AssemblyName>Deedle.CSharp.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
@@ -37,8 +37,8 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FSharp.DataFrame">
-      <HintPath>..\..\bin\FSharp.DataFrame.dll</HintPath>
+    <Reference Include="Deedle">
+      <HintPath>..\..\bin\Deedle.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/tests/Deedle.CSharp.Tests/Frame.cs b/tests/Deedle.CSharp.Tests/Frame.cs
index 968a92ff..7c992638 100644
--- a/tests/Deedle.CSharp.Tests/Frame.cs
+++ b/tests/Deedle.CSharp.Tests/Frame.cs
@@ -5,11 +5,11 @@
 using System.Threading.Tasks;
 
 using NUnit.Framework;
-using FSharp.DataFrame;
+using Deedle;
 using System.Runtime.CompilerServices;
 using System.IO;
 
-namespace FSharp.DataFrame.CSharp.Tests
+namespace Deedle.CSharp.Tests
 {
 	/* ----------------------------------------------------------------------------------
 	 * Test calling Frame.Zip from C#
@@ -18,7 +18,7 @@ public class FrameZipTests
 	{
 		public static Frame<int, string> LoadMSFT([CallerFilePath] string source = "")
 		{
-			var file = Path.Combine(Path.GetDirectoryName(source), @"..\FSharp.DataFrame.Tests\data\MSFT.csv");
+			var file = Path.Combine(Path.GetDirectoryName(source), @"..\Deedle.Tests\data\MSFT.csv");
 			return Frame.ReadCsv(file, inferRows:10);
 		}
 
diff --git a/tests/Deedle.CSharp.Tests/Properties/AssemblyInfo.cs b/tests/Deedle.CSharp.Tests/Properties/AssemblyInfo.cs
index f1e5ebf0..c6f91221 100644
--- a/tests/Deedle.CSharp.Tests/Properties/AssemblyInfo.cs
+++ b/tests/Deedle.CSharp.Tests/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("FSharp.DataFrame.CSharp.Tests")]
+[assembly: AssemblyTitle("Deedle.CSharp.Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("FSharp.DataFrame.CSharp.Tests")]
+[assembly: AssemblyProduct("Deedle.CSharp.Tests")]
 [assembly: AssemblyCopyright("Copyright © Microsoft 2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/tests/Deedle.CSharp.Tests/Series.cs b/tests/Deedle.CSharp.Tests/Series.cs
index 0870709c..03cd9417 100644
--- a/tests/Deedle.CSharp.Tests/Series.cs
+++ b/tests/Deedle.CSharp.Tests/Series.cs
@@ -5,9 +5,9 @@
 using System.Threading.Tasks;
 
 using NUnit.Framework;
-using FSharp.DataFrame;
+using Deedle;
 
-namespace FSharp.DataFrame.CSharp.Tests
+namespace Deedle.CSharp.Tests
 {
 	/* ----------------------------------------------------------------------------------
 	 * Test series builder
@@ -122,7 +122,7 @@ static void Main(string[] args)
 		Console.WriteLine(s2.Sum());
 
     var df = Frame.FromColumns(new[] { 1, 2, 3 }, new[] { new KeyValuePair<string, Series<int, double>>("Test", s2) });
-    Console.WriteLine(((FSharp.DataFrame.Internal.IFsiFormattable)df).Format());
+    Console.WriteLine(((Deedle.Internal.IFsiFormattable)df).Format());
 
 
 		// Aggregation.WindowSize(0, Boundary.AtBeginning)
diff --git a/tests/Deedle.Tests.Console/Deedle.Console.fsproj b/tests/Deedle.Tests.Console/Deedle.Tests.Console.fsproj
similarity index 100%
rename from tests/Deedle.Tests.Console/Deedle.Console.fsproj
rename to tests/Deedle.Tests.Console/Deedle.Tests.Console.fsproj