diff --git a/Source/MonoGame.Extended.sln b/Source/MonoGame.Extended.sln
index 81074191..da56bb4f 100644
--- a/Source/MonoGame.Extended.sln
+++ b/Source/MonoGame.Extended.sln
@@ -1,96 +1,97 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Extended", "MonoGame.Extended\MonoGame.Extended.csproj", "{41724C52-3D50-45BB-81EB-3C8A247EAFD1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{068B9F42-8B49-4FAF-9D8C-701862FAC799}"
-	ProjectSection(SolutionItems) = preProject
-		..\README.md = ..\README.md
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sandbox", "Sandbox\Sandbox.csproj", "{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}"
-	ProjectSection(ProjectDependencies) = postProject
-		{28CD24BD-432C-4987-9E9D-65CFCF120EA0} = {28CD24BD-432C-4987-9E9D-65CFCF120EA0}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Extended.Content.Pipeline", "MonoGame.Extended.Content.Pipeline\MonoGame.Extended.Content.Pipeline.csproj", "{28CD24BD-432C-4987-9E9D-65CFCF120EA0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E5A148A1-DE7B-4D17-ABE8-831B9673B863}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Extended.Tests", "MonoGame.Extended.Tests\MonoGame.Extended.Tests.csproj", "{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Extended.Content.Pipeline.Tests", "MonoGame.Extended.Content.Pipeline.Tests\MonoGame.Extended.Content.Pipeline.Tests.csproj", "{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Release|x86.ActiveCfg = Release|Any CPU
-		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Debug|x86.ActiveCfg = Debug|x86
-		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Debug|x86.Build.0 = Debug|x86
-		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Release|Any CPU.ActiveCfg = Release|x86
-		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Release|Mixed Platforms.Build.0 = Release|x86
-		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Release|x86.ActiveCfg = Release|x86
-		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Release|x86.Build.0 = Release|x86
-		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Debug|x86.Build.0 = Debug|Any CPU
-		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Release|x86.ActiveCfg = Release|Any CPU
-		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Release|x86.Build.0 = Release|Any CPU
-		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Release|x86.ActiveCfg = Release|Any CPU
-		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Release|x86.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1} = {E5A148A1-DE7B-4D17-ABE8-831B9673B863}
-		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C} = {E5A148A1-DE7B-4D17-ABE8-831B9673B863}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Extended", "MonoGame.Extended\MonoGame.Extended.csproj", "{41724C52-3D50-45BB-81EB-3C8A247EAFD1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{068B9F42-8B49-4FAF-9D8C-701862FAC799}"
+	ProjectSection(SolutionItems) = preProject
+		MonoGame.Extended.nuspec = MonoGame.Extended.nuspec
+		..\README.md = ..\README.md
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sandbox", "Sandbox\Sandbox.csproj", "{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}"
+	ProjectSection(ProjectDependencies) = postProject
+		{28CD24BD-432C-4987-9E9D-65CFCF120EA0} = {28CD24BD-432C-4987-9E9D-65CFCF120EA0}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Extended.Content.Pipeline", "MonoGame.Extended.Content.Pipeline\MonoGame.Extended.Content.Pipeline.csproj", "{28CD24BD-432C-4987-9E9D-65CFCF120EA0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E5A148A1-DE7B-4D17-ABE8-831B9673B863}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Extended.Tests", "MonoGame.Extended.Tests\MonoGame.Extended.Tests.csproj", "{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Extended.Content.Pipeline.Tests", "MonoGame.Extended.Content.Pipeline.Tests\MonoGame.Extended.Content.Pipeline.Tests.csproj", "{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{41724C52-3D50-45BB-81EB-3C8A247EAFD1}.Release|x86.ActiveCfg = Release|Any CPU
+		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Debug|x86.ActiveCfg = Debug|x86
+		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Debug|x86.Build.0 = Debug|x86
+		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Release|Any CPU.ActiveCfg = Release|x86
+		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Release|Mixed Platforms.Build.0 = Release|x86
+		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Release|x86.ActiveCfg = Release|x86
+		{B7965D5F-83D2-4C04-B9FE-7D5FBF365F93}.Release|x86.Build.0 = Release|x86
+		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Debug|x86.Build.0 = Debug|Any CPU
+		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Release|x86.ActiveCfg = Release|Any CPU
+		{28CD24BD-432C-4987-9E9D-65CFCF120EA0}.Release|x86.Build.0 = Release|Any CPU
+		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1}.Release|x86.ActiveCfg = Release|Any CPU
+		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C}.Release|x86.ActiveCfg = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{CEF2144F-7E98-45A5-BE08-E6DBC307A5C1} = {E5A148A1-DE7B-4D17-ABE8-831B9673B863}
+		{75D76507-9CB0-4A60-BE46-696DF6E7AA6C} = {E5A148A1-DE7B-4D17-ABE8-831B9673B863}
+	EndGlobalSection
+EndGlobal
diff --git a/Source/MonoGame.Extended/MonoGame.Extended.csproj b/Source/MonoGame.Extended/MonoGame.Extended.csproj
index 7c53c73b..d312b43e 100644
--- a/Source/MonoGame.Extended/MonoGame.Extended.csproj
+++ b/Source/MonoGame.Extended/MonoGame.Extended.csproj
@@ -75,9 +75,6 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="MonoGame.Extended.nuspec" />
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.