diff --git a/ANX.Framework/NonXNA/AddInSystemFactory.cs b/ANX.Framework/NonXNA/AddInSystemFactory.cs
index dbec292c..796a0522 100644
--- a/ANX.Framework/NonXNA/AddInSystemFactory.cs
+++ b/ANX.Framework/NonXNA/AddInSystemFactory.cs
@@ -315,7 +315,7 @@ namespace ANX.Framework.NonXNA
             }
             set
             {
-                if (this.preferredRenderSystemLocked && !this.preferredRenderSystem.Equals(value, StringComparison.InvariantCultureIgnoreCase))
+                if (this.preferredRenderSystemLocked)
                 {
                     throw new AddInLoadingException("can't set preferred RenderSystem because a RenderSystem is alread in use.");
                 }
@@ -332,7 +332,7 @@ namespace ANX.Framework.NonXNA
             }
             set
             {
-                if (this.preferredInputSystemLocked && !this.preferredInputSystem.Equals(value, StringComparison.InvariantCultureIgnoreCase))
+                if (this.preferredInputSystemLocked)
                 {
                     throw new AddInLoadingException("can't set preferred InputSystem because a InputSystem is alread in use.");
                 }
@@ -349,7 +349,7 @@ namespace ANX.Framework.NonXNA
             }
             set
             {
-                if (this.preferredSoundSystemLocked && !this.preferredSoundSystem.Equals(value, StringComparison.InvariantCultureIgnoreCase))
+                if (this.preferredSoundSystemLocked)
                 {
                     throw new AddInLoadingException("can't set preferred SoundSystem because a SoundSystem is alread in use.");
                 }
diff --git a/ANX.Framework/Properties/AssemblyInfo.cs b/ANX.Framework/Properties/AssemblyInfo.cs
index 67502b3f..5fd35fab 100644
--- a/ANX.Framework/Properties/AssemblyInfo.cs
+++ b/ANX.Framework/Properties/AssemblyInfo.cs
@@ -31,8 +31,8 @@ using System.Runtime.InteropServices;
 //
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
-[assembly: AssemblyVersion("0.4.35.*")]
-[assembly: AssemblyFileVersion("0.4.35.0")]
+[assembly: AssemblyVersion("0.4.36.*")]
+[assembly: AssemblyFileVersion("0.4.36.0")]
 
 [assembly:InternalsVisibleTo("ANX.Framework.Windows.DX10")]
 [assembly:InternalsVisibleTo("ANX.RenderSystem.Windows.DX11")]
diff --git a/RenderSystems/ANX.Framework.Windows.GL3/ShaderByteCode.cs b/RenderSystems/ANX.Framework.Windows.GL3/ShaderByteCode.cs
index 7a940fa2..c8e7c983 100644
--- a/RenderSystems/ANX.Framework.Windows.GL3/ShaderByteCode.cs
+++ b/RenderSystems/ANX.Framework.Windows.GL3/ShaderByteCode.cs
@@ -54,7 +54,7 @@ namespace ANX.Framework.Windows.GL3
 		#region SpriteBatchShader
 		internal static byte[] SpriteBatchByteCode = new byte[]
 		{
-			186, 
+			180, 
 			003, 117, 110, 105, 102, 111, 114, 109, 032, 109, 097, 116, 052, 032, 077, 097, 116, 114, 105, 120, 
 			084, 114, 097, 110, 115, 102, 111, 114, 109, 059, 010, 097, 116, 116, 114, 105, 098, 117, 116, 101, 
 			032, 118, 101, 099, 052, 032, 112, 111, 115, 059, 010, 097, 116, 116, 114, 105, 098, 117, 116, 101, 
@@ -62,25 +62,25 @@ namespace ANX.Framework.Windows.GL3
 			032, 118, 101, 099, 050, 032, 116, 101, 120, 059, 010, 118, 097, 114, 121, 105, 110, 103, 032, 118, 
 			101, 099, 052, 032, 100, 105, 102, 102, 117, 115, 101, 067, 111, 108, 111, 114, 059, 010, 118, 097, 
 			114, 121, 105, 110, 103, 032, 118, 101, 099, 050, 032, 100, 105, 102, 102, 117, 115, 101, 084, 101, 
-			120, 067, 111, 111, 114, 100, 059, 010, 118, 111, 105, 100, 032, 109, 097, 105, 110, 040, 118, 111, 
-			105, 100, 041, 123, 010, 103, 108, 095, 080, 111, 115, 105, 116, 105, 111, 110, 061, 077, 097, 116, 
-			114, 105, 120, 084, 114, 097, 110, 115, 102, 111, 114, 109, 042, 112, 111, 115, 059, 010, 100, 105, 
-			102, 102, 117, 115, 101, 084, 101, 120, 067, 111, 111, 114, 100, 061, 116, 101, 120, 059, 010, 100, 
-			105, 102, 102, 117, 115, 101, 067, 111, 108, 111, 114, 061, 099, 111, 108, 059, 125, 010, 035, 035, 
-			033, 102, 114, 097, 103, 109, 101, 110, 116, 033, 035, 035, 010, 112, 114, 101, 099, 105, 115, 115, 
-			105, 111, 110, 032, 109, 101, 100, 105, 117, 109, 112, 032, 102, 108, 111, 097, 116, 059, 010, 117, 
-			110, 105, 102, 111, 114, 109, 032, 115, 097, 109, 112, 108, 101, 114, 050, 068, 032, 084, 101, 120, 
-			116, 117, 114, 101, 059, 010, 118, 097, 114, 121, 105, 110, 103, 032, 118, 101, 099, 052, 032, 100, 
-			105, 102, 102, 117, 115, 101, 067, 111, 108, 111, 114, 059, 010, 118, 097, 114, 121, 105, 110, 103, 
-			032, 118, 101, 099, 050, 032, 100, 105, 102, 102, 117, 115, 101, 084, 101, 120, 067, 111, 111, 114, 
-			100, 059, 010, 118, 111, 105, 100, 032, 109, 097, 105, 110, 040, 118, 111, 105, 100, 041, 123, 010, 
-			103, 108, 095, 070, 114, 097, 103, 067, 111, 108, 111, 114, 061, 116, 101, 120, 116, 117, 114, 101, 
-			050, 068, 040, 084, 101, 120, 116, 117, 114, 101, 044, 100, 105, 102, 102, 117, 115, 101, 084, 101, 
-			120, 067, 111, 111, 114, 100, 041, 042, 100, 105, 102, 102, 117, 115, 101, 067, 111, 108, 111, 114, 
-			059, 125, 010, 204, 002, 066, 009, 044, 094, 101, 149, 163, 197, 203, 229, 083, 172, 100, 007, 002, 
-			181, 147, 172, 186, 193, 103, 068, 009, 005, 065, 152, 020, 077, 034, 207, 124, 030, 210, 046, 182, 
-			155, 204, 156, 086, 170, 100, 065, 083, 209, 239, 206, 226, 075, 115, 157, 118, 160, 025, 101, 098, 
-			159, 062, 171, 094, 128, 095, 188
+			120, 067, 111, 111, 114, 100, 059, 010, 118, 111, 105, 100, 032, 109, 097, 105, 110, 040, 032, 041, 
+			123, 010, 103, 108, 095, 080, 111, 115, 105, 116, 105, 111, 110, 061, 077, 097, 116, 114, 105, 120, 
+			084, 114, 097, 110, 115, 102, 111, 114, 109, 042, 112, 111, 115, 059, 010, 100, 105, 102, 102, 117, 
+			115, 101, 084, 101, 120, 067, 111, 111, 114, 100, 061, 116, 101, 120, 059, 010, 100, 105, 102, 102, 
+			117, 115, 101, 067, 111, 108, 111, 114, 061, 099, 111, 108, 059, 125, 010, 035, 035, 033, 102, 114, 
+			097, 103, 109, 101, 110, 116, 033, 035, 035, 010, 112, 114, 101, 099, 105, 115, 115, 105, 111, 110, 
+			032, 109, 101, 100, 105, 117, 109, 112, 032, 102, 108, 111, 097, 116, 059, 010, 117, 110, 105, 102, 
+			111, 114, 109, 032, 115, 097, 109, 112, 108, 101, 114, 050, 068, 032, 084, 101, 120, 116, 117, 114, 
+			101, 059, 010, 118, 097, 114, 121, 105, 110, 103, 032, 118, 101, 099, 052, 032, 100, 105, 102, 102, 
+			117, 115, 101, 067, 111, 108, 111, 114, 059, 010, 118, 097, 114, 121, 105, 110, 103, 032, 118, 101, 
+			099, 050, 032, 100, 105, 102, 102, 117, 115, 101, 084, 101, 120, 067, 111, 111, 114, 100, 059, 010, 
+			118, 111, 105, 100, 032, 109, 097, 105, 110, 040, 032, 041, 123, 010, 103, 108, 095, 070, 114, 097, 
+			103, 067, 111, 108, 111, 114, 061, 116, 101, 120, 116, 117, 114, 101, 050, 068, 040, 084, 101, 120, 
+			116, 117, 114, 101, 044, 100, 105, 102, 102, 117, 115, 101, 084, 101, 120, 067, 111, 111, 114, 100, 
+			041, 042, 100, 105, 102, 102, 117, 115, 101, 067, 111, 108, 111, 114, 059, 125, 010, 086, 087, 131, 
+			182, 038, 179, 193, 226, 251, 193, 042, 232, 050, 136, 064, 087, 245, 166, 178, 106, 045, 070, 101, 
+			038, 108, 096, 128, 039, 041, 206, 046, 082, 012, 201, 196, 054, 107, 012, 036, 042, 201, 075, 019, 
+			238, 148, 026, 221, 157, 011, 092, 071, 242, 175, 166, 135, 135, 045, 079, 158, 203, 065, 100, 242, 
+			030
 		};
 		#endregion //SpriteBatchShader
 
diff --git a/Samples/VertexIndexBuffer/Game1.cs b/Samples/VertexIndexBuffer/Game1.cs
index 531b0117..3dfd6cab 100644
--- a/Samples/VertexIndexBuffer/Game1.cs
+++ b/Samples/VertexIndexBuffer/Game1.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using ANX.Framework;
 using ANX.Framework.Graphics;
 using ANX.Framework.Input;
+using ANX.Framework.NonXNA;
 
 #endregion // Using Statements