diff --git a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs
index 67767ed1..7936e005 100644
--- a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs
+++ b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs
@@ -52,12 +52,16 @@ namespace Cxxi.Generators.CSharp
             WriteLine("using System.Runtime.InteropServices;");
             NewLine();
 
-            WriteLine("namespace {0}", SafeIdentifier(Driver.Options.LibraryName));
-            WriteStartBraceIndent();
+            if (Options.GenerateLibraryNamespace)
+            {
+                WriteLine("namespace {0}", SafeIdentifier(Driver.Options.LibraryName));
+                WriteStartBraceIndent();
+            }
 
             GenerateDeclarations();
 
-            WriteCloseBraceIndent();
+            if (Options.GenerateLibraryNamespace)
+                WriteCloseBraceIndent();
         }
 
         public void GenerateStart()