diff --git a/Samples/AudioSample.sln b/Samples/AudioSample.sln
index de058ad3..16811272 100644
--- a/Samples/AudioSample.sln
+++ b/Samples/AudioSample.sln
@@ -1,58 +1,223 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleContent", "SampleContent\SampleContent.contentproj", "{FA6E229D-4504-47B1-8A23-2D3FCC13F778}"
-EndProject
+# Visual Studio 2013
+VisualStudioVersion = 12.0.40629.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AudioSample", "AudioSample\AudioSample.csproj", "{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C} = {75EFAE60-726E-430F-8661-4CF9ABD1306C}
+	EndProjectSection
+EndProject
+Project("{75EFAE60-726E-430F-8661-4CF9ABD1306C}") = "SampleContent", "SampleContent\SampleContent.cproj", "{75EFAE60-726E-430F-8661-4CF9ABD1306C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|0 = Debug|0
+		Debug|Android = Debug|Android
 		Debug|Any CPU = Debug|Any CPU
+		Debug|iOS = Debug|iOS
+		Debug|Linux = Debug|Linux
+		Debug|Mac OS = Debug|Mac OS
 		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|PS Vita = Debug|PS Vita
+		Debug|Windows = Debug|Windows
+		Debug|Windows Metro = Debug|Windows Metro
+		Debug|Windows Phone = Debug|Windows Phone
 		Debug|x86 = Debug|x86
+		Debug|XBox 360 = Debug|XBox 360
+		DebugWin8|0 = DebugWin8|0
+		DebugWin8|Android = DebugWin8|Android
 		DebugWin8|Any CPU = DebugWin8|Any CPU
+		DebugWin8|iOS = DebugWin8|iOS
+		DebugWin8|Linux = DebugWin8|Linux
+		DebugWin8|Mac OS = DebugWin8|Mac OS
 		DebugWin8|Mixed Platforms = DebugWin8|Mixed Platforms
+		DebugWin8|PS Vita = DebugWin8|PS Vita
+		DebugWin8|Windows = DebugWin8|Windows
+		DebugWin8|Windows Metro = DebugWin8|Windows Metro
+		DebugWin8|Windows Phone = DebugWin8|Windows Phone
 		DebugWin8|x86 = DebugWin8|x86
+		DebugWin8|XBox 360 = DebugWin8|XBox 360
+		Release|0 = Release|0
+		Release|Android = Release|Android
 		Release|Any CPU = Release|Any CPU
+		Release|iOS = Release|iOS
+		Release|Linux = Release|Linux
+		Release|Mac OS = Release|Mac OS
 		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|PS Vita = Release|PS Vita
+		Release|Windows = Release|Windows
+		Release|Windows Metro = Release|Windows Metro
+		Release|Windows Phone = Release|Windows Phone
 		Release|x86 = Release|x86
+		Release|XBox 360 = Release|XBox 360
+		ReleaseWin8|0 = ReleaseWin8|0
+		ReleaseWin8|Android = ReleaseWin8|Android
 		ReleaseWin8|Any CPU = ReleaseWin8|Any CPU
+		ReleaseWin8|iOS = ReleaseWin8|iOS
+		ReleaseWin8|Linux = ReleaseWin8|Linux
+		ReleaseWin8|Mac OS = ReleaseWin8|Mac OS
 		ReleaseWin8|Mixed Platforms = ReleaseWin8|Mixed Platforms
+		ReleaseWin8|PS Vita = ReleaseWin8|PS Vita
+		ReleaseWin8|Windows = ReleaseWin8|Windows
+		ReleaseWin8|Windows Metro = ReleaseWin8|Windows Metro
+		ReleaseWin8|Windows Phone = ReleaseWin8|Windows Phone
 		ReleaseWin8|x86 = ReleaseWin8|x86
+		ReleaseWin8|XBox 360 = ReleaseWin8|XBox 360
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.DebugWin8|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.DebugWin8|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.DebugWin8|x86.ActiveCfg = Debug|Any CPU
-		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|x86.ActiveCfg = Debug|Any CPU
-		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.ReleaseWin8|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.ReleaseWin8|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.ReleaseWin8|x86.ActiveCfg = Debug|Any CPU
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|x86.ActiveCfg = Debug|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|x86.Build.0 = Debug|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|Any CPU.ActiveCfg = Debug|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|Mixed Platforms.ActiveCfg = Debug|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|Mixed Platforms.Build.0 = Debug|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|x86.ActiveCfg = Debug|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|x86.Build.0 = Debug|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Any CPU.ActiveCfg = Release|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Mixed Platforms.Build.0 = Release|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|x86.ActiveCfg = Release|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|x86.Build.0 = Release|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|Any CPU.ActiveCfg = Release|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|Mixed Platforms.ActiveCfg = Release|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|Mixed Platforms.Build.0 = Release|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|x86.ActiveCfg = Release|x86
-		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|x86.Build.0 = Release|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|0.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Android.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|iOS.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Linux.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Mac OS.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|PS Vita.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Windows.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Windows Metro.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Windows Phone.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|XBox 360.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|0.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|Android.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|Any CPU.Build.0 = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|iOS.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|Linux.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|Mac OS.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|PS Vita.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|Windows.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|Windows Metro.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|Windows Phone.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|x86.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.DebugWin8|XBox 360.ActiveCfg = Debug|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|0.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Android.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|iOS.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Linux.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Mac OS.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|PS Vita.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Windows.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Windows Metro.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Windows Phone.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|x86.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|XBox 360.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|0.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|Android.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|Any CPU.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|Any CPU.Build.0 = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|iOS.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|Linux.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|Mac OS.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|Mixed Platforms.Build.0 = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|PS Vita.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|Windows.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|Windows Metro.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|Windows Phone.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|x86.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.ReleaseWin8|XBox 360.ActiveCfg = Release|Any CPU
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|0.ActiveCfg = Debug|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Android.ActiveCfg = Debug|Android
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Android.Build.0 = Debug|Android
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Any CPU.ActiveCfg = Debug|Android
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|iOS.ActiveCfg = Debug|iOS
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|iOS.Build.0 = Debug|iOS
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Linux.ActiveCfg = Debug|Linux
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Linux.Build.0 = Debug|Linux
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Mac OS.ActiveCfg = Debug|Mac OS
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Mac OS.Build.0 = Debug|Mac OS
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Mixed Platforms.ActiveCfg = Debug|Windows
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Mixed Platforms.Build.0 = Debug|Windows
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|PS Vita.ActiveCfg = Debug|PS Vita
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|PS Vita.Build.0 = Debug|PS Vita
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows.ActiveCfg = Debug|Windows
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows.Build.0 = Debug|Windows
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows Metro.ActiveCfg = Debug|Windows Metro
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows Metro.Build.0 = Debug|Windows Metro
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows Phone.ActiveCfg = Debug|Windows Phone
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows Phone.Build.0 = Debug|Windows Phone
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|x86.ActiveCfg = Debug|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|XBox 360.ActiveCfg = Debug|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|XBox 360.Build.0 = Debug|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|0.ActiveCfg = Debug|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Android.ActiveCfg = Debug|Android
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Android.Build.0 = Debug|Android
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Any CPU.ActiveCfg = Debug|Android
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|iOS.ActiveCfg = Debug|iOS
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|iOS.Build.0 = Debug|iOS
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Linux.ActiveCfg = Debug|Linux
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Linux.Build.0 = Debug|Linux
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Mac OS.ActiveCfg = Debug|Mac OS
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Mac OS.Build.0 = Debug|Mac OS
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Mixed Platforms.ActiveCfg = Debug|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Mixed Platforms.Build.0 = Debug|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|PS Vita.ActiveCfg = Debug|PS Vita
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|PS Vita.Build.0 = Debug|PS Vita
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Windows.ActiveCfg = Debug|Windows
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Windows.Build.0 = Debug|Windows
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Windows Metro.ActiveCfg = Debug|Windows Metro
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Windows Metro.Build.0 = Debug|Windows Metro
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Windows Phone.ActiveCfg = Debug|Windows Phone
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|Windows Phone.Build.0 = Debug|Windows Phone
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|x86.ActiveCfg = Debug|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|XBox 360.ActiveCfg = Debug|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.DebugWin8|XBox 360.Build.0 = Debug|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|0.ActiveCfg = Release|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Android.ActiveCfg = Release|Android
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Android.Build.0 = Release|Android
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Any CPU.ActiveCfg = Release|Android
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|iOS.ActiveCfg = Release|iOS
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|iOS.Build.0 = Release|iOS
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Linux.ActiveCfg = Release|Linux
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Linux.Build.0 = Release|Linux
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mac OS.ActiveCfg = Release|Mac OS
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mac OS.Build.0 = Release|Mac OS
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mixed Platforms.ActiveCfg = Release|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mixed Platforms.Build.0 = Release|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|PS Vita.ActiveCfg = Release|PS Vita
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|PS Vita.Build.0 = Release|PS Vita
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows.ActiveCfg = Release|Windows
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows.Build.0 = Release|Windows
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows Metro.ActiveCfg = Release|Windows Metro
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows Metro.Build.0 = Release|Windows Metro
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows Phone.ActiveCfg = Release|Windows Phone
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows Phone.Build.0 = Release|Windows Phone
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|x86.ActiveCfg = Release|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|XBox 360.ActiveCfg = Release|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|XBox 360.Build.0 = Release|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|0.ActiveCfg = Release|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Android.ActiveCfg = Release|Android
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Android.Build.0 = Release|Android
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Any CPU.ActiveCfg = Release|Android
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|iOS.ActiveCfg = Release|iOS
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|iOS.Build.0 = Release|iOS
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Linux.ActiveCfg = Release|Linux
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Linux.Build.0 = Release|Linux
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Mac OS.ActiveCfg = Release|Mac OS
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Mac OS.Build.0 = Release|Mac OS
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Mixed Platforms.ActiveCfg = Release|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Mixed Platforms.Build.0 = Release|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|PS Vita.ActiveCfg = Release|PS Vita
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|PS Vita.Build.0 = Release|PS Vita
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Windows.ActiveCfg = Release|Windows
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Windows.Build.0 = Release|Windows
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Windows Metro.ActiveCfg = Release|Windows Metro
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Windows Metro.Build.0 = Release|Windows Metro
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Windows Phone.ActiveCfg = Release|Windows Phone
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|Windows Phone.Build.0 = Release|Windows Phone
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|x86.ActiveCfg = Release|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|XBox 360.ActiveCfg = Release|XBox 360
+		{75EFAE60-726E-430F-8661-4CF9ABD1306C}.ReleaseWin8|XBox 360.Build.0 = Release|XBox 360
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Samples/AudioSample/AudioSample.csproj b/Samples/AudioSample/AudioSample.csproj
index 3dd068c6..b4aa0f71 100644
--- a/Samples/AudioSample/AudioSample.csproj
+++ b/Samples/AudioSample/AudioSample.csproj
@@ -1,65 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <ProjectGuid>{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}</ProjectGuid>
-    <ProjectTypeGuids>{6D335F3A-9D43-41b4-9D22-F6F17C4BE596};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AudioSample</RootNamespace>
     <AssemblyName>AudioSample</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <XnaFrameworkVersion>v4.0</XnaFrameworkVersion>
-    <XnaPlatform>Windows</XnaPlatform>
-    <XnaProfile>HiDef</XnaProfile>
-    <XnaCrossPlatformGroupID>4b57417a-c755-4652-a34c-9beb83e18811</XnaCrossPlatformGroupID>
-    <XnaOutputType>Game</XnaOutputType>
     <ApplicationIcon>anx.ico</ApplicationIcon>
-    <Thumbnail>GameThumbnail.png</Thumbnail>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\x86\Debug</OutputPath>
+    <OutputPath>bin\Debug</OutputPath>
     <DefineConstants>TRACE;DEBUG;WINDOWS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoStdLib>true</NoStdLib>
     <UseVSHostingProcess>false</UseVSHostingProcess>
-    <PlatformTarget>x86</PlatformTarget>
-    <XnaCompressContent>false</XnaCompressContent>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\x86\Release</OutputPath>
+    <OutputPath>bin\Release</OutputPath>
     <DefineConstants>TRACE;WINDOWS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoStdLib>true</NoStdLib>
     <UseVSHostingProcess>false</UseVSHostingProcess>
-    <PlatformTarget>x86</PlatformTarget>
-    <XnaCompressContent>true</XnaCompressContent>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ANX.Framework">
+      <HintPath>..\..\bin\Debug\ANX.Framework.dll</HintPath>
+    </Reference>
+    <Reference Include="ANX.InputDevices.Windows.XInput">
+      <HintPath>..\..\bin\Debug\ANX.InputDevices.Windows.XInput.dll</HintPath>
+    </Reference>
+    <Reference Include="ANX.InputSystem.Standard">
+      <HintPath>..\..\bin\Debug\ANX.InputSystem.Standard.dll</HintPath>
+    </Reference>
+    <Reference Include="ANX.PlatformSystem.Windows">
+      <HintPath>..\..\bin\Debug\ANX.PlatformSystem.Windows.dll</HintPath>
+    </Reference>
+    <Reference Include="ANX.RenderSystem.Windows.DX10">
+      <HintPath>..\..\bin\Debug\ANX.RenderSystem.Windows.DX10.dll</HintPath>
+    </Reference>
+    <Reference Include="ANX.SoundSystem.Windows.XAudio">
+      <HintPath>..\..\bin\Debug\ANX.SoundSystem.Windows.XAudio.dll</HintPath>
+    </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="System">
       <Private>False</Private>
@@ -74,41 +70,6 @@
     <Content Include="anx.ico" />
     <Content Include="GameThumbnail.png" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ANX.Framework\ANX.Framework.csproj">
-      <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
-      <Name>ANX.Framework</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\InputSystems\ANX.InputDevices.Windows.XInput\ANX.InputDevices.Windows.XInput.csproj">
-      <Project>{60D08399-244F-46A3-91F1-4CFD26D961A3}</Project>
-      <Name>ANX.InputDevices.Windows.XInput</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\InputSystems\ANX.InputSystem.Standard\ANX.InputSystem.Standard.csproj">
-      <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
-      <Name>ANX.InputSystem.Standard</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows.csproj">
-      <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
-      <Name>ANX.PlatformSystem.Windows</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10.csproj">
-      <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
-      <Name>ANX.RenderSystem.Windows.DX10</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.OpenAL\ANX.SoundSystem.OpenAL.csproj">
-      <Project>{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}</Project>
-      <Name>ANX.SoundSystem.OpenAL</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio.csproj">
-      <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
-      <Name>ANX.SoundSystem.Windows.XAudio</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\SampleContent\SampleContent.contentproj">
-      <Project>{FA6E229D-4504-47B1-8A23-2D3FCC13F778}</Project>
-      <Name>SampleContent</Name>
-      <XnaReferenceType>Content</XnaReferenceType>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
       <Visible>False</Visible>
@@ -130,14 +91,11 @@
       <ProductName>Windows Installer 3.1</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Xna.Framework.4.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft XNA Framework Redistributable 4.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\Microsoft.Xna.GameStudio.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy $(ProjectDir)..\SampleContent\bin\$(ConfigurationName) $(TargetDir)SampleContent\  /D /E /Y</PostBuildEvent>
+  </PropertyGroup>
   <!--
       To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Samples/SampleContent/SampleContent.cproj b/Samples/SampleContent/SampleContent.cproj
index e200e983..9f77424e 100644
--- a/Samples/SampleContent/SampleContent.cproj
+++ b/Samples/SampleContent/SampleContent.cproj
@@ -92,11 +92,6 @@
       <OutputPath>bin\Xbox 360\Release</OutputPath>
       <CompressContent>false</CompressContent>
     </Configuration>
-    <Configuration Name="Debug" Platform="0">
-      <Profile>Reach</Profile>
-      <OutputPath>bin\Debug</OutputPath>
-      <CompressContent>false</CompressContent>
-    </Configuration>
   </Configurations>
   <References>
     <AssemblyReference Name="ANX.Framework.Content.Pipeline.Assimp">..\..\bin\Debug\ANX.Framework.Content.Pipeline.Assimp.dll</AssemblyReference>
diff --git a/Support/WaveUtils/WaveConverter.cs b/Support/WaveUtils/WaveConverter.cs
index 59aa79b5..14ee3f3f 100644
--- a/Support/WaveUtils/WaveConverter.cs
+++ b/Support/WaveUtils/WaveConverter.cs
@@ -41,6 +41,10 @@ namespace WaveUtils
 					MsAdpcm.ConvertToPcm(loadedData);
 					break;
 
+                case WaveFormat.PCM:
+                    //If it's already PCM, don't convert anything.
+                    break;
+
 				default:
 					throw new NotSupportedException("The WAVE format " + loadedData.WaveFormat +
 						" is not supported yet. Unable to load!");
diff --git a/Visual Studio/ANXVisualStudioPackage/Nodes/ContentProjectNode.cs b/Visual Studio/ANXVisualStudioPackage/Nodes/ContentProjectNode.cs
index f40f4cbb..a9381b8d 100644
--- a/Visual Studio/ANXVisualStudioPackage/Nodes/ContentProjectNode.cs	
+++ b/Visual Studio/ANXVisualStudioPackage/Nodes/ContentProjectNode.cs	
@@ -545,16 +545,20 @@ namespace ANX.Framework.VisualStudio.Nodes
             var dte = (EnvDTE.DTE)this.GetService(typeof(EnvDTE.DTE));
             var configurations = dte.Solution.SolutionBuild.SolutionConfigurations.AsEnumerable();
             var names = configurations.Select((x) => x.Name).Distinct().ToArray();
-
-            var unsupportedConfigurations = anxContentProject.Configurations.GetUniqueNames().Where((x) => !names.Contains(x)).ToArray();
-            foreach (var configName in unsupportedConfigurations)
+            string[] platforms;
+            using (var buildAppDomain = this.BuildAppDomain.Aquire())
             {
-                Console.WriteLine("Removed configuration \"" + configName + "\" because it's not supported by this solution.");
-                foreach (var affectedConfig in anxContentProject.Configurations.Where((x) => x.Name == configName).ToArray())
-                {
-                    anxContentProject.Configurations.Remove(affectedConfig);
-                }
+                platforms = buildAppDomain.Proxy.GetPlatformDisplayNames();
             }
+
+            var unsupportedConfigurations = anxContentProject.Configurations.Where((x) => !names.Contains(x.Name) || !platforms.Contains(Utilities.GetDisplayName(x.Platform))).ToArray();
+            foreach (var config in unsupportedConfigurations)
+            {
+                Console.WriteLine("Removed configuration \"{0}\":\"{1}\" because it's not supported by this solution.", config.Name, config.Platform);
+                anxContentProject.Configurations.Remove(config);
+            }
+
+
         }
 
         public override void ProcessFiles()