diff --git a/AbnfToAntlr.Common/AbnfToAntlr.Common.csproj b/AbnfToAntlr.Common/AbnfToAntlr.Common.csproj
index a7ae86a..34acbf6 100644
--- a/AbnfToAntlr.Common/AbnfToAntlr.Common.csproj
+++ b/AbnfToAntlr.Common/AbnfToAntlr.Common.csproj
@@ -47,13 +47,16 @@
     <Compile Include="AbnfAstLexer.cs" />
     <Compile Include="AbnfAstParser.cs" />
     <Compile Include="AbnfToAntlrTranslator.cs" />
+    <Compile Include="INamedCharacterLookup.cs" />
     <Compile Include="NamedCharacter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="NamedCharacterLookupSimple.cs" />
     <Compile Include="TreeVisitor.cs" />
     <Compile Include="TreeVisitor_GatherDistinctCharacters.cs" />
     <Compile Include="TreeVisitor_OutputTranslation.cs" />
     <Compile Include="TreeVisitor_OutputTranslation_Direct.cs" />
     <Compile Include="TreeVisitor_OutputTranslation_Indirect.cs" />
+    <Compile Include="NamedCharacterLookupUnicode.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/AbnfToAntlr.Common/AbnfToAntlrTranslator.cs b/AbnfToAntlr.Common/AbnfToAntlrTranslator.cs
index b763e2a..47f8763 100644
--- a/AbnfToAntlr.Common/AbnfToAntlrTranslator.cs
+++ b/AbnfToAntlr.Common/AbnfToAntlrTranslator.cs
@@ -132,16 +132,20 @@ public void Translate(TextReader input, TextWriter writer, bool performDirectTra
                 // get parse tree
                 var tree = results.Tree;
 
-                // gather set of disctinct literals
+                // give lexer rules unicode standard names
+                INamedCharacterLookup lookup = new NamedCharacterLookupUnicode();
+
+                // enable the next line to give lexer rules simple names
+                lookup = new NamedCharacterLookupSimple();
 
                 // output translated grammar
                 if (performDirectTranslation)
                 {
-                    OutputDirectTranslation(writer, tokens, tree);
+                    OutputDirectTranslation(writer, tokens, tree, lookup);
                 }
                 else
                 {
-                    OutputIndirectTranslation(writer, tokens, tree);
+                    OutputIndirectTranslation(writer, tokens, tree, lookup);
                 }
             }
         }
@@ -163,46 +167,51 @@ public string Translate(string abnfGrammar, bool performDirectTranslation = fals
         }
 
 
-        void OutputDirectTranslation(TextWriter writer, CommonTokenStream tokens, CommonTree tree)
+        void OutputDirectTranslation(TextWriter writer, CommonTokenStream tokens, CommonTree tree, INamedCharacterLookup lookup)
         {
             // output ANTLR translation
-            var outputVisitor = new TreeVisitor_OutputTranslation_Direct(tokens, writer);
+            var outputVisitor = new TreeVisitor_OutputTranslation_Direct(tokens, writer, lookup);
             outputVisitor.Visit(tree);
         }
 
-        void OutputIndirectTranslation(TextWriter writer, CommonTokenStream tokens, CommonTree tree)
+        void OutputIndirectTranslation(TextWriter writer, CommonTokenStream tokens, CommonTree tree, INamedCharacterLookup lookup)
         {
             // gather distinct literals
             var distinctCharacters = new Dictionary<char, NamedCharacter>();
-            var literalVisitor = new TreeVisitor_GatherDistinctCharacters(distinctCharacters);
+            var literalVisitor = new TreeVisitor_GatherDistinctCharacters(distinctCharacters, lookup);
             literalVisitor.Visit(tree);
 
             // output ANTLR translation (substitute rules for character literals)
-            var outputVisitor = new TreeVisitor_OutputTranslation_Indirect(tokens, writer, distinctCharacters);
+            var outputVisitor = new TreeVisitor_OutputTranslation_Indirect(tokens, writer, distinctCharacters, lookup);
             outputVisitor.Visit(tree);
 
             // append literal rules to output
-            OutputLiteralRules(distinctCharacters, writer);
+            OutputLiteralRules(distinctCharacters, writer, lookup);
         }
 
-        void OutputLiteralRules(IDictionary<char, NamedCharacter> literals, TextWriter writer)
+        void OutputLiteralRules(IDictionary<char, NamedCharacter> literals, TextWriter writer, INamedCharacterLookup lookup)
         {
-            var knownValues = literals.Values
-                .Where(x => NamedCharacter.IsKnownCharacter(x.Character))
+            var knownValues = 
+                literals.Values
+                .Where(x => lookup.IsKnownCharacter(x.Character))
                 .OrderBy(x => x.Character)
                 .Select(x => x);
 
-            var unknownValues = literals.Values
-                .Where(x => !(NamedCharacter.IsKnownCharacter(x.Character)))
+            var unknownValues = 
+                literals.Values
+                .Where(x => !(lookup.IsKnownCharacter(x.Character)))
                 .OrderBy(x => x.Character)
                 .Select(x => x);
 
-            writer.WriteLine("");
-            writer.WriteLine(@"//////////////////////////////////////////////////////////////////////////");
-            writer.WriteLine(@"// Lexer rules generated for each distinct character in original grammar");
-            writer.WriteLine(@"// per http://www.unicode.org/charts/PDF/U0000.pdf");
-            writer.WriteLine(@"//////////////////////////////////////////////////////////////////////////");
-            writer.WriteLine("");
+            if (literals.Count > 0)
+            {
+                writer.WriteLine("");
+                writer.WriteLine(@"//////////////////////////////////////////////////////////////////////////");
+                writer.WriteLine(@"// Lexer rules generated for each distinct character in original grammar");
+                writer.WriteLine(@"// per http://www.unicode.org/charts/PDF/U0000.pdf");
+                writer.WriteLine(@"//////////////////////////////////////////////////////////////////////////");
+                writer.WriteLine("");
+            }
 
             // output known (named) literals first
             foreach (var value in knownValues)
diff --git a/AbnfToAntlr.Common/INamedCharacterLookup.cs b/AbnfToAntlr.Common/INamedCharacterLookup.cs
new file mode 100644
index 0000000..a6f4cc6
--- /dev/null
+++ b/AbnfToAntlr.Common/INamedCharacterLookup.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AbnfToAntlr.Common
+{
+    public interface INamedCharacterLookup
+    {
+        bool IsKnownCharacter(char character);
+        NamedCharacter GetNamedCharacter(char character);
+    }
+}
diff --git a/AbnfToAntlr.Common/NamedCharacter.cs b/AbnfToAntlr.Common/NamedCharacter.cs
index 5ef84bb..b909727 100644
--- a/AbnfToAntlr.Common/NamedCharacter.cs
+++ b/AbnfToAntlr.Common/NamedCharacter.cs
@@ -30,145 +30,5 @@ public class NamedCharacter
     {
         public string Name;
         public char Character;
-
-        // Official character names from Unicode.org
-        // http://www.unicode.org/charts/PDF/U0000.pdf
-
-        public readonly static Dictionary<char, NamedCharacter> KnownCharacters = 
-            new Dictionary<char, NamedCharacter> 
-            {
-                { 'A', new NamedCharacter { Name = "CAPITAL_LETTER_A", Character = 'A' } },
-                { 'B', new NamedCharacter { Name = "CAPITAL_LETTER_B", Character = 'B' } },
-                { 'C', new NamedCharacter { Name = "CAPITAL_LETTER_C", Character = 'C' } },
-                { 'D', new NamedCharacter { Name = "CAPITAL_LETTER_D", Character = 'D' } },
-                { 'E', new NamedCharacter { Name = "CAPITAL_LETTER_E", Character = 'E' } },
-                { 'F', new NamedCharacter { Name = "CAPITAL_LETTER_F", Character = 'F' } },
-                { 'G', new NamedCharacter { Name = "CAPITAL_LETTER_G", Character = 'G' } },
-                { 'H', new NamedCharacter { Name = "CAPITAL_LETTER_H", Character = 'H' } },
-                { 'I', new NamedCharacter { Name = "CAPITAL_LETTER_I", Character = 'I' } },
-                { 'J', new NamedCharacter { Name = "CAPITAL_LETTER_J", Character = 'J' } },
-                { 'K', new NamedCharacter { Name = "CAPITAL_LETTER_K", Character = 'K' } },
-                { 'L', new NamedCharacter { Name = "CAPITAL_LETTER_L", Character = 'L' } },
-                { 'M', new NamedCharacter { Name = "CAPITAL_LETTER_M", Character = 'M' } },
-                { 'N', new NamedCharacter { Name = "CAPITAL_LETTER_N", Character = 'N' } },
-                { 'O', new NamedCharacter { Name = "CAPITAL_LETTER_O", Character = 'O' } },
-                { 'P', new NamedCharacter { Name = "CAPITAL_LETTER_P", Character = 'P' } },
-                { 'Q', new NamedCharacter { Name = "CAPITAL_LETTER_Q", Character = 'Q' } },
-                { 'R', new NamedCharacter { Name = "CAPITAL_LETTER_R", Character = 'R' } },
-                { 'S', new NamedCharacter { Name = "CAPITAL_LETTER_S", Character = 'S' } },
-                { 'T', new NamedCharacter { Name = "CAPITAL_LETTER_T", Character = 'T' } },
-                { 'U', new NamedCharacter { Name = "CAPITAL_LETTER_U", Character = 'U' } },
-                { 'V', new NamedCharacter { Name = "CAPITAL_LETTER_V", Character = 'V' } },
-                { 'W', new NamedCharacter { Name = "CAPITAL_LETTER_W", Character = 'W' } },
-                { 'X', new NamedCharacter { Name = "CAPITAL_LETTER_X", Character = 'X' } },
-                { 'Y', new NamedCharacter { Name = "CAPITAL_LETTER_Y", Character = 'Y' } },
-                { 'Z', new NamedCharacter { Name = "CAPITAL_LETTER_Z", Character = 'Z' } },
-
-                { 'a', new NamedCharacter { Name = "SMALL_LETTER_A", Character = 'a' } },
-                { 'b', new NamedCharacter { Name = "SMALL_LETTER_B", Character = 'b' } },
-                { 'c', new NamedCharacter { Name = "SMALL_LETTER_C", Character = 'c' } },
-                { 'd', new NamedCharacter { Name = "SMALL_LETTER_D", Character = 'd' } },
-                { 'e', new NamedCharacter { Name = "SMALL_LETTER_E", Character = 'e' } },
-                { 'f', new NamedCharacter { Name = "SMALL_LETTER_F", Character = 'f' } },
-                { 'g', new NamedCharacter { Name = "SMALL_LETTER_G", Character = 'g' } },
-                { 'h', new NamedCharacter { Name = "SMALL_LETTER_H", Character = 'h' } },
-                { 'j', new NamedCharacter { Name = "SMALL_LETTER_I", Character = 'j' } },
-                { 'i', new NamedCharacter { Name = "SMALL_LETTER_J", Character = 'i' } },
-                { 'k', new NamedCharacter { Name = "SMALL_LETTER_K", Character = 'k' } },
-                { 'l', new NamedCharacter { Name = "SMALL_LETTER_L", Character = 'l' } },
-                { 'm', new NamedCharacter { Name = "SMALL_LETTER_M", Character = 'm' } },
-                { 'n', new NamedCharacter { Name = "SMALL_LETTER_N", Character = 'n' } },
-                { 'o', new NamedCharacter { Name = "SMALL_LETTER_O", Character = 'o' } },
-                { 'p', new NamedCharacter { Name = "SMALL_LETTER_P", Character = 'p' } },
-                { 'q', new NamedCharacter { Name = "SMALL_LETTER_Q", Character = 'q' } },
-                { 'r', new NamedCharacter { Name = "SMALL_LETTER_R", Character = 'r' } },
-                { 's', new NamedCharacter { Name = "SMALL_LETTER_S", Character = 's' } },
-                { 't', new NamedCharacter { Name = "SMALL_LETTER_T", Character = 't' } },
-                { 'u', new NamedCharacter { Name = "SMALL_LETTER_U", Character = 'u' } },
-                { 'v', new NamedCharacter { Name = "SMALL_LETTER_V", Character = 'v' } },
-                { 'w', new NamedCharacter { Name = "SMALL_LETTER_W", Character = 'w' } },
-                { 'x', new NamedCharacter { Name = "SMALL_LETTER_X", Character = 'x' } },
-                { 'y', new NamedCharacter { Name = "SMALL_LETTER_Y", Character = 'y' } },
-                { 'z', new NamedCharacter { Name = "SMALL_LETTER_Z", Character = 'z' } },
-
-                { '`', new NamedCharacter { Name = "GRAVE_ACCENT", Character = '`' } },
-                { '1', new NamedCharacter { Name = "DIGIT_ONE", Character = '1' } },
-                { '2', new NamedCharacter { Name = "DIGIT_TWO", Character = '2' } },
-                { '3', new NamedCharacter { Name = "DIGIT_THREE", Character = '3' } },
-                { '4', new NamedCharacter { Name = "DIGIT_FOUR", Character = '4' } },
-                { '5', new NamedCharacter { Name = "DIGIT_FIVE", Character = '5' } },
-                { '6', new NamedCharacter { Name = "DIGIT_SIX", Character = '6' } },
-                { '7', new NamedCharacter { Name = "DIGIT_SEVEN", Character = '7' } },
-                { '8', new NamedCharacter { Name = "DIGIT_EIGHT", Character = '8' } },
-                { '9', new NamedCharacter { Name = "DIGIT_NINE", Character = '9' } },
-                { '0', new NamedCharacter { Name = "DIGIT_ZERO", Character = '0' } },
-                { '-', new NamedCharacter { Name = "HYPHEN_MINUS", Character = '-' } },
-                { '=', new NamedCharacter { Name = "EQUALS_SIGN", Character = '=' } },
-                { '[', new NamedCharacter { Name = "LEFT_SQUARE_BRACKET", Character = '[' } },
-                { ']', new NamedCharacter { Name = "RIGHT_SQUARE_BRACKET", Character = ']' } },
-                { '\\', new NamedCharacter { Name = "REVERSE_SOLIDUS", Character = '\\' } },
-                { ';', new NamedCharacter { Name = "SEMICOLON", Character = ';' } },
-                { '\'', new NamedCharacter { Name = "APOSTROPHE", Character = '\'' } },
-                { ',', new NamedCharacter { Name = "COMMA", Character = ',' } },
-                { '.', new NamedCharacter { Name = "FULL_STOP", Character = '.' } },
-                { '/', new NamedCharacter { Name = "SOLIDUS", Character = '/' } },
-                { '~', new NamedCharacter { Name = "TILDE", Character = '~' } },
-
-                { '!', new NamedCharacter { Name = "EXCLAMATION_MARK", Character = '!' } },
-                { '@', new NamedCharacter { Name = "COMMERCIAL_AT", Character = '@' } },
-                { '#', new NamedCharacter { Name = "NUMBER_SIGN", Character = '#' } },
-                { '$', new NamedCharacter { Name = "DOLLAR_SIGN", Character = '$' } },
-                { '%', new NamedCharacter { Name = "PERCENT_SIGN", Character = '%' } },
-                { '^', new NamedCharacter { Name = "CIRCUMFLEX_ACCENT", Character = '^' } },
-                { '&', new NamedCharacter { Name = "AMPERSAND", Character = '&' } },
-                { '*', new NamedCharacter { Name = "ASTERISK", Character = '*' } },
-                { '(', new NamedCharacter { Name = "LEFT_PARENTHESIS", Character = '(' } },
-                { ')', new NamedCharacter { Name = "RIGHT_PARENTHESIS", Character = ')' } },
-                { '_', new NamedCharacter { Name = "LOW_LINE", Character = '_' } },
-                { '+', new NamedCharacter { Name = "PLUS_SIGN", Character = '+' } },
-                { '{', new NamedCharacter { Name = "LEFT_CURLY_BRACKET", Character = '{' } },
-                { '}', new NamedCharacter { Name = "RIGHT_CURLY_BRACKET", Character = '}' } },
-                { '|', new NamedCharacter { Name = "VERTICAL_LINE", Character = '|' } },
-                { ':', new NamedCharacter { Name = "COLON", Character = ':' } },
-                { '\"', new NamedCharacter { Name = "QUOTATION_MARK", Character = '\"' } },
-                { '<', new NamedCharacter { Name = "LESS_THAN_SIGN", Character = '<' } },
-                { '>', new NamedCharacter { Name = "GREATER_THAN_SIGN", Character = '>' } },
-                { '?', new NamedCharacter { Name = "QUESTION_MARK", Character = '?' } },
-
-                { ' ', new NamedCharacter { Name = "SPACE", Character = ' ' } },
-
-                { '\u0009', new NamedCharacter { Name = "TAB", Character = '\u0009' } },
-                { '\u000D', new NamedCharacter { Name = "CARRIAGE_RETURN", Character = '\u000D' } },
-                { '\u000A', new NamedCharacter { Name = "LINE_FEED", Character = '\u000A' } },
-            };
-
-        public static bool IsKnownCharacter(char character)
-        {
-            return KnownCharacters.ContainsKey(character);
-        }
-
-        public static NamedCharacter GetNamedCharacter(char character)
-        {
-            NamedCharacter result;
-
-            if (KnownCharacters.TryGetValue(character, out result))
-            {
-                // do nothing
-            }
-            else
-            {
-                string name = "UNICODE_" + ((int)character).ToString("X4");
-
-                result = 
-                    new NamedCharacter 
-                    { 
-                        Name = name, 
-                        Character = character 
-                    };
-            }
-
-            return result;
-        }
-
-    } // class
-} // namespace
+    }
+}
diff --git a/AbnfToAntlr.Common/NamedCharacterLookupSimple.cs b/AbnfToAntlr.Common/NamedCharacterLookupSimple.cs
new file mode 100644
index 0000000..7908894
--- /dev/null
+++ b/AbnfToAntlr.Common/NamedCharacterLookupSimple.cs
@@ -0,0 +1,171 @@
+/*
+
+    Copyright 2012-2013 Robert Pinchbeck
+  
+    This file is part of AbnfToAntlr.
+
+    AbnfToAntlr is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    AbnfToAntlr is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with AbnfToAntlr.  If not, see <http://www.gnu.org/licenses/>.
+  
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AbnfToAntlr.Common
+{
+    public class NamedCharacterLookupSimple : INamedCharacterLookup
+    {
+        // Official character names from Unicode.org
+        // http://www.unicode.org/charts/PDF/U0000.pdf
+
+        public readonly static Dictionary<char, NamedCharacter> KnownCharacters = 
+            new Dictionary<char, NamedCharacter> 
+            {
+                { 'A', new NamedCharacter { Name = "CAP_A", Character = 'A' } },
+                { 'B', new NamedCharacter { Name = "CAP_B", Character = 'B' } },
+                { 'C', new NamedCharacter { Name = "CAP_C", Character = 'C' } },
+                { 'D', new NamedCharacter { Name = "CAP_D", Character = 'D' } },
+                { 'E', new NamedCharacter { Name = "CAP_E", Character = 'E' } },
+                { 'F', new NamedCharacter { Name = "CAP_F", Character = 'F' } },
+                { 'G', new NamedCharacter { Name = "CAP_G", Character = 'G' } },
+                { 'H', new NamedCharacter { Name = "CAP_H", Character = 'H' } },
+                { 'I', new NamedCharacter { Name = "CAP_I", Character = 'I' } },
+                { 'J', new NamedCharacter { Name = "CAP_J", Character = 'J' } },
+                { 'K', new NamedCharacter { Name = "CAP_K", Character = 'K' } },
+                { 'L', new NamedCharacter { Name = "CAP_L", Character = 'L' } },
+                { 'M', new NamedCharacter { Name = "CAP_M", Character = 'M' } },
+                { 'N', new NamedCharacter { Name = "CAP_N", Character = 'N' } },
+                { 'O', new NamedCharacter { Name = "CAP_O", Character = 'O' } },
+                { 'P', new NamedCharacter { Name = "CAP_P", Character = 'P' } },
+                { 'Q', new NamedCharacter { Name = "CAP_Q", Character = 'Q' } },
+                { 'R', new NamedCharacter { Name = "CAP_R", Character = 'R' } },
+                { 'S', new NamedCharacter { Name = "CAP_S", Character = 'S' } },
+                { 'T', new NamedCharacter { Name = "CAP_T", Character = 'T' } },
+                { 'U', new NamedCharacter { Name = "CAP_U", Character = 'U' } },
+                { 'V', new NamedCharacter { Name = "CAP_V", Character = 'V' } },
+                { 'W', new NamedCharacter { Name = "CAP_W", Character = 'W' } },
+                { 'X', new NamedCharacter { Name = "CAP_X", Character = 'X' } },
+                { 'Y', new NamedCharacter { Name = "CAP_Y", Character = 'Y' } },
+                { 'Z', new NamedCharacter { Name = "CAP_Z", Character = 'Z' } },
+
+                { 'a', new NamedCharacter { Name = "A", Character = 'a' } },
+                { 'b', new NamedCharacter { Name = "B", Character = 'b' } },
+                { 'c', new NamedCharacter { Name = "C", Character = 'c' } },
+                { 'd', new NamedCharacter { Name = "D", Character = 'd' } },
+                { 'e', new NamedCharacter { Name = "E", Character = 'e' } },
+                { 'f', new NamedCharacter { Name = "F", Character = 'f' } },
+                { 'g', new NamedCharacter { Name = "G", Character = 'g' } },
+                { 'h', new NamedCharacter { Name = "H", Character = 'h' } },
+                { 'i', new NamedCharacter { Name = "I", Character = 'i' } },
+                { 'j', new NamedCharacter { Name = "J", Character = 'j' } },
+                { 'k', new NamedCharacter { Name = "K", Character = 'k' } },
+                { 'l', new NamedCharacter { Name = "L", Character = 'l' } },
+                { 'm', new NamedCharacter { Name = "M", Character = 'm' } },
+                { 'n', new NamedCharacter { Name = "N", Character = 'n' } },
+                { 'o', new NamedCharacter { Name = "O", Character = 'o' } },
+                { 'p', new NamedCharacter { Name = "P", Character = 'p' } },
+                { 'q', new NamedCharacter { Name = "Q", Character = 'q' } },
+                { 'r', new NamedCharacter { Name = "R", Character = 'r' } },
+                { 's', new NamedCharacter { Name = "S", Character = 's' } },
+                { 't', new NamedCharacter { Name = "T", Character = 't' } },
+                { 'u', new NamedCharacter { Name = "U", Character = 'u' } },
+                { 'v', new NamedCharacter { Name = "V", Character = 'v' } },
+                { 'w', new NamedCharacter { Name = "W", Character = 'w' } },
+                { 'x', new NamedCharacter { Name = "X", Character = 'x' } },
+                { 'y', new NamedCharacter { Name = "Y", Character = 'y' } },
+                { 'z', new NamedCharacter { Name = "Z", Character = 'z' } },
+
+                { '`', new NamedCharacter { Name = "ACCENT", Character = '`' } },
+                { '1', new NamedCharacter { Name = "ONE", Character = '1' } },
+                { '2', new NamedCharacter { Name = "TWO", Character = '2' } },
+                { '3', new NamedCharacter { Name = "THREE", Character = '3' } },
+                { '4', new NamedCharacter { Name = "FOUR", Character = '4' } },
+                { '5', new NamedCharacter { Name = "FIVE", Character = '5' } },
+                { '6', new NamedCharacter { Name = "SIX", Character = '6' } },
+                { '7', new NamedCharacter { Name = "SEVEN", Character = '7' } },
+                { '8', new NamedCharacter { Name = "EIGHT", Character = '8' } },
+                { '9', new NamedCharacter { Name = "NINE", Character = '9' } },
+                { '0', new NamedCharacter { Name = "ZERO", Character = '0' } },
+                { '-', new NamedCharacter { Name = "DASH", Character = '-' } },
+                { '=', new NamedCharacter { Name = "EQUALS", Character = '=' } },
+                { '[', new NamedCharacter { Name = "LEFT_BRACE", Character = '[' } },
+                { ']', new NamedCharacter { Name = "RIGHT_BRACE", Character = ']' } },
+                { '\\', new NamedCharacter { Name = "BACKSLASH", Character = '\\' } },
+                { ';', new NamedCharacter { Name = "SEMICOLON", Character = ';' } },
+                { '\'', new NamedCharacter { Name = "APOSTROPHE", Character = '\'' } },
+                { ',', new NamedCharacter { Name = "COMMA", Character = ',' } },
+                { '.', new NamedCharacter { Name = "PERIOD", Character = '.' } },
+                { '/', new NamedCharacter { Name = "SLASH", Character = '/' } },
+                { '~', new NamedCharacter { Name = "TILDE", Character = '~' } },
+
+                { '!', new NamedCharacter { Name = "EXCLAMATION", Character = '!' } },
+                { '@', new NamedCharacter { Name = "AT", Character = '@' } },
+                { '#', new NamedCharacter { Name = "POUND", Character = '#' } },
+                { '$', new NamedCharacter { Name = "DOLLAR", Character = '$' } },
+                { '%', new NamedCharacter { Name = "PERCENT", Character = '%' } },
+                { '^', new NamedCharacter { Name = "CARAT", Character = '^' } },
+                { '&', new NamedCharacter { Name = "AMPERSAND", Character = '&' } },
+                { '*', new NamedCharacter { Name = "ASTERISK", Character = '*' } },
+                { '(', new NamedCharacter { Name = "LEFT_PAREN", Character = '(' } },
+                { ')', new NamedCharacter { Name = "RIGHT_PAREN", Character = ')' } },
+                { '_', new NamedCharacter { Name = "UNDERSCORE", Character = '_' } },
+                { '+', new NamedCharacter { Name = "PLUS", Character = '+' } },
+                { '{', new NamedCharacter { Name = "LEFT_CURLY_BRACE", Character = '{' } },
+                { '}', new NamedCharacter { Name = "RIGHT_CURLY_BRACE", Character = '}' } },
+                { '|', new NamedCharacter { Name = "PIPE", Character = '|' } },
+                { ':', new NamedCharacter { Name = "COLON", Character = ':' } },
+                { '\"', new NamedCharacter { Name = "QUOTE", Character = '\"' } },
+                { '<', new NamedCharacter { Name = "LESS_THAN", Character = '<' } },
+                { '>', new NamedCharacter { Name = "GREATER_THAN", Character = '>' } },
+                { '?', new NamedCharacter { Name = "QUESTION", Character = '?' } },
+
+                { ' ', new NamedCharacter { Name = "SPACE", Character = ' ' } },
+
+                { '\u0009', new NamedCharacter { Name = "TAB", Character = '\u0009' } },
+                { '\u000D', new NamedCharacter { Name = "CR", Character = '\u000D' } },
+                { '\u000A', new NamedCharacter { Name = "LF", Character = '\u000A' } },
+            };
+
+        public bool IsKnownCharacter(char character)
+        {
+            return KnownCharacters.ContainsKey(character);
+        }
+
+        public NamedCharacter GetNamedCharacter(char character)
+        {
+            NamedCharacter result;
+
+            if (KnownCharacters.TryGetValue(character, out result))
+            {
+                // do nothing
+            }
+            else
+            {
+                string name = "U_" + ((int)character).ToString("X4");
+
+                result = 
+                    new NamedCharacter 
+                    { 
+                        Name = name, 
+                        Character = character 
+                    };
+            }
+
+            return result;
+        }
+
+    } // class
+} // namespace
diff --git a/AbnfToAntlr.Common/NamedCharacterLookupUnicode.cs b/AbnfToAntlr.Common/NamedCharacterLookupUnicode.cs
new file mode 100644
index 0000000..1c9cf11
--- /dev/null
+++ b/AbnfToAntlr.Common/NamedCharacterLookupUnicode.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AbnfToAntlr.Common
+{
+    public class NamedCharacterLookupUnicode : INamedCharacterLookup
+    {
+        // Official character names from Unicode.org
+        // http://www.unicode.org/charts/PDF/U0000.pdf
+
+        public readonly static Dictionary<char, NamedCharacter> KnownCharacters =
+            new Dictionary<char, NamedCharacter> 
+            {
+                { 'A', new NamedCharacter { Name = "CAPITAL_LETTER_A", Character = 'A' } },
+                { 'B', new NamedCharacter { Name = "CAPITAL_LETTER_B", Character = 'B' } },
+                { 'C', new NamedCharacter { Name = "CAPITAL_LETTER_C", Character = 'C' } },
+                { 'D', new NamedCharacter { Name = "CAPITAL_LETTER_D", Character = 'D' } },
+                { 'E', new NamedCharacter { Name = "CAPITAL_LETTER_E", Character = 'E' } },
+                { 'F', new NamedCharacter { Name = "CAPITAL_LETTER_F", Character = 'F' } },
+                { 'G', new NamedCharacter { Name = "CAPITAL_LETTER_G", Character = 'G' } },
+                { 'H', new NamedCharacter { Name = "CAPITAL_LETTER_H", Character = 'H' } },
+                { 'I', new NamedCharacter { Name = "CAPITAL_LETTER_I", Character = 'I' } },
+                { 'J', new NamedCharacter { Name = "CAPITAL_LETTER_J", Character = 'J' } },
+                { 'K', new NamedCharacter { Name = "CAPITAL_LETTER_K", Character = 'K' } },
+                { 'L', new NamedCharacter { Name = "CAPITAL_LETTER_L", Character = 'L' } },
+                { 'M', new NamedCharacter { Name = "CAPITAL_LETTER_M", Character = 'M' } },
+                { 'N', new NamedCharacter { Name = "CAPITAL_LETTER_N", Character = 'N' } },
+                { 'O', new NamedCharacter { Name = "CAPITAL_LETTER_O", Character = 'O' } },
+                { 'P', new NamedCharacter { Name = "CAPITAL_LETTER_P", Character = 'P' } },
+                { 'Q', new NamedCharacter { Name = "CAPITAL_LETTER_Q", Character = 'Q' } },
+                { 'R', new NamedCharacter { Name = "CAPITAL_LETTER_R", Character = 'R' } },
+                { 'S', new NamedCharacter { Name = "CAPITAL_LETTER_S", Character = 'S' } },
+                { 'T', new NamedCharacter { Name = "CAPITAL_LETTER_T", Character = 'T' } },
+                { 'U', new NamedCharacter { Name = "CAPITAL_LETTER_U", Character = 'U' } },
+                { 'V', new NamedCharacter { Name = "CAPITAL_LETTER_V", Character = 'V' } },
+                { 'W', new NamedCharacter { Name = "CAPITAL_LETTER_W", Character = 'W' } },
+                { 'X', new NamedCharacter { Name = "CAPITAL_LETTER_X", Character = 'X' } },
+                { 'Y', new NamedCharacter { Name = "CAPITAL_LETTER_Y", Character = 'Y' } },
+                { 'Z', new NamedCharacter { Name = "CAPITAL_LETTER_Z", Character = 'Z' } },
+
+                { 'a', new NamedCharacter { Name = "SMALL_LETTER_A", Character = 'a' } },
+                { 'b', new NamedCharacter { Name = "SMALL_LETTER_B", Character = 'b' } },
+                { 'c', new NamedCharacter { Name = "SMALL_LETTER_C", Character = 'c' } },
+                { 'd', new NamedCharacter { Name = "SMALL_LETTER_D", Character = 'd' } },
+                { 'e', new NamedCharacter { Name = "SMALL_LETTER_E", Character = 'e' } },
+                { 'f', new NamedCharacter { Name = "SMALL_LETTER_F", Character = 'f' } },
+                { 'g', new NamedCharacter { Name = "SMALL_LETTER_G", Character = 'g' } },
+                { 'h', new NamedCharacter { Name = "SMALL_LETTER_H", Character = 'h' } },
+                { 'i', new NamedCharacter { Name = "SMALL_LETTER_I", Character = 'i' } },
+                { 'j', new NamedCharacter { Name = "SMALL_LETTER_J", Character = 'j' } },
+                { 'k', new NamedCharacter { Name = "SMALL_LETTER_K", Character = 'k' } },
+                { 'l', new NamedCharacter { Name = "SMALL_LETTER_L", Character = 'l' } },
+                { 'm', new NamedCharacter { Name = "SMALL_LETTER_M", Character = 'm' } },
+                { 'n', new NamedCharacter { Name = "SMALL_LETTER_N", Character = 'n' } },
+                { 'o', new NamedCharacter { Name = "SMALL_LETTER_O", Character = 'o' } },
+                { 'p', new NamedCharacter { Name = "SMALL_LETTER_P", Character = 'p' } },
+                { 'q', new NamedCharacter { Name = "SMALL_LETTER_Q", Character = 'q' } },
+                { 'r', new NamedCharacter { Name = "SMALL_LETTER_R", Character = 'r' } },
+                { 's', new NamedCharacter { Name = "SMALL_LETTER_S", Character = 's' } },
+                { 't', new NamedCharacter { Name = "SMALL_LETTER_T", Character = 't' } },
+                { 'u', new NamedCharacter { Name = "SMALL_LETTER_U", Character = 'u' } },
+                { 'v', new NamedCharacter { Name = "SMALL_LETTER_V", Character = 'v' } },
+                { 'w', new NamedCharacter { Name = "SMALL_LETTER_W", Character = 'w' } },
+                { 'x', new NamedCharacter { Name = "SMALL_LETTER_X", Character = 'x' } },
+                { 'y', new NamedCharacter { Name = "SMALL_LETTER_Y", Character = 'y' } },
+                { 'z', new NamedCharacter { Name = "SMALL_LETTER_Z", Character = 'z' } },
+
+                { '`', new NamedCharacter { Name = "GRAVE_ACCENT", Character = '`' } },
+                { '1', new NamedCharacter { Name = "DIGIT_ONE", Character = '1' } },
+                { '2', new NamedCharacter { Name = "DIGIT_TWO", Character = '2' } },
+                { '3', new NamedCharacter { Name = "DIGIT_THREE", Character = '3' } },
+                { '4', new NamedCharacter { Name = "DIGIT_FOUR", Character = '4' } },
+                { '5', new NamedCharacter { Name = "DIGIT_FIVE", Character = '5' } },
+                { '6', new NamedCharacter { Name = "DIGIT_SIX", Character = '6' } },
+                { '7', new NamedCharacter { Name = "DIGIT_SEVEN", Character = '7' } },
+                { '8', new NamedCharacter { Name = "DIGIT_EIGHT", Character = '8' } },
+                { '9', new NamedCharacter { Name = "DIGIT_NINE", Character = '9' } },
+                { '0', new NamedCharacter { Name = "DIGIT_ZERO", Character = '0' } },
+                { '-', new NamedCharacter { Name = "HYPHEN_MINUS", Character = '-' } },
+                { '=', new NamedCharacter { Name = "EQUALS_SIGN", Character = '=' } },
+                { '[', new NamedCharacter { Name = "LEFT_SQUARE_BRACKET", Character = '[' } },
+                { ']', new NamedCharacter { Name = "RIGHT_SQUARE_BRACKET", Character = ']' } },
+                { '\\', new NamedCharacter { Name = "REVERSE_SOLIDUS", Character = '\\' } },
+                { ';', new NamedCharacter { Name = "SEMICOLON", Character = ';' } },
+                { '\'', new NamedCharacter { Name = "APOSTROPHE", Character = '\'' } },
+                { ',', new NamedCharacter { Name = "COMMA", Character = ',' } },
+                { '.', new NamedCharacter { Name = "FULL_STOP", Character = '.' } },
+                { '/', new NamedCharacter { Name = "SOLIDUS", Character = '/' } },
+                { '~', new NamedCharacter { Name = "TILDE", Character = '~' } },
+
+                { '!', new NamedCharacter { Name = "EXCLAMATION_MARK", Character = '!' } },
+                { '@', new NamedCharacter { Name = "COMMERCIAL_AT", Character = '@' } },
+                { '#', new NamedCharacter { Name = "NUMBER_SIGN", Character = '#' } },
+                { '$', new NamedCharacter { Name = "DOLLAR_SIGN", Character = '$' } },
+                { '%', new NamedCharacter { Name = "PERCENT_SIGN", Character = '%' } },
+                { '^', new NamedCharacter { Name = "CIRCUMFLEX_ACCENT", Character = '^' } },
+                { '&', new NamedCharacter { Name = "AMPERSAND", Character = '&' } },
+                { '*', new NamedCharacter { Name = "ASTERISK", Character = '*' } },
+                { '(', new NamedCharacter { Name = "LEFT_PARENTHESIS", Character = '(' } },
+                { ')', new NamedCharacter { Name = "RIGHT_PARENTHESIS", Character = ')' } },
+                { '_', new NamedCharacter { Name = "LOW_LINE", Character = '_' } },
+                { '+', new NamedCharacter { Name = "PLUS_SIGN", Character = '+' } },
+                { '{', new NamedCharacter { Name = "LEFT_CURLY_BRACKET", Character = '{' } },
+                { '}', new NamedCharacter { Name = "RIGHT_CURLY_BRACKET", Character = '}' } },
+                { '|', new NamedCharacter { Name = "VERTICAL_LINE", Character = '|' } },
+                { ':', new NamedCharacter { Name = "COLON", Character = ':' } },
+                { '\"', new NamedCharacter { Name = "QUOTATION_MARK", Character = '\"' } },
+                { '<', new NamedCharacter { Name = "LESS_THAN_SIGN", Character = '<' } },
+                { '>', new NamedCharacter { Name = "GREATER_THAN_SIGN", Character = '>' } },
+                { '?', new NamedCharacter { Name = "QUESTION_MARK", Character = '?' } },
+
+                { ' ', new NamedCharacter { Name = "SPACE", Character = ' ' } },
+
+                { '\u0009', new NamedCharacter { Name = "TAB", Character = '\u0009' } },
+                { '\u000D', new NamedCharacter { Name = "CARRIAGE_RETURN", Character = '\u000D' } },
+                { '\u000A', new NamedCharacter { Name = "LINE_FEED", Character = '\u000A' } },
+            };
+
+        public bool IsKnownCharacter(char character)
+        {
+            return KnownCharacters.ContainsKey(character);
+        }
+
+        public NamedCharacter GetNamedCharacter(char character)
+        {
+            NamedCharacter result;
+
+            if (KnownCharacters.TryGetValue(character, out result))
+            {
+                // do nothing
+            }
+            else
+            {
+                string name = "UNICODE_" + ((int)character).ToString("X4");
+
+                result =
+                    new NamedCharacter
+                    {
+                        Name = name,
+                        Character = character
+                    };
+            }
+
+            return result;
+        }
+
+    }
+}
diff --git a/AbnfToAntlr.Common/Properties/AssemblyInfo.cs b/AbnfToAntlr.Common/Properties/AssemblyInfo.cs
index 241d01f..f4b6245 100644
--- a/AbnfToAntlr.Common/Properties/AssemblyInfo.cs
+++ b/AbnfToAntlr.Common/Properties/AssemblyInfo.cs
@@ -53,5 +53,5 @@ You should have received a copy of the GNU General Public License
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
diff --git a/AbnfToAntlr.Common/TreeVisitor_GatherDistinctCharacters.cs b/AbnfToAntlr.Common/TreeVisitor_GatherDistinctCharacters.cs
index 6e5aba1..e86ae22 100644
--- a/AbnfToAntlr.Common/TreeVisitor_GatherDistinctCharacters.cs
+++ b/AbnfToAntlr.Common/TreeVisitor_GatherDistinctCharacters.cs
@@ -32,10 +32,12 @@ namespace AbnfToAntlr.Common
     class TreeVisitor_GatherDistinctCharacters : TreeVisitor
     {
         IDictionary<char, NamedCharacter> _distinctCharacters;
+        INamedCharacterLookup _lookup;
 
-        public TreeVisitor_GatherDistinctCharacters(IDictionary<char, NamedCharacter> literals)
+        public TreeVisitor_GatherDistinctCharacters(IDictionary<char, NamedCharacter> literals, INamedCharacterLookup lookup)
         {
             _distinctCharacters = literals;
+            _lookup = lookup;
 
             CommonConstructor();
         }
@@ -167,7 +169,7 @@ void AddText(string text)
                 }
                 else
                 {
-                    var namedCharacter = NamedCharacter.GetNamedCharacter(character);
+                    var namedCharacter = _lookup.GetNamedCharacter(character);
 
                     _distinctCharacters.Add(character, namedCharacter);
                 }
@@ -187,7 +189,7 @@ void AddValue(int value)
             }
             else
             {
-                var namedCharacter = NamedCharacter.GetNamedCharacter(character);
+                var namedCharacter = _lookup.GetNamedCharacter(character);
 
                 _distinctCharacters.Add(character, namedCharacter);
             }
diff --git a/AbnfToAntlr.Common/TreeVisitor_OutputTranslation.cs b/AbnfToAntlr.Common/TreeVisitor_OutputTranslation.cs
index 366f18a..8e843e1 100644
--- a/AbnfToAntlr.Common/TreeVisitor_OutputTranslation.cs
+++ b/AbnfToAntlr.Common/TreeVisitor_OutputTranslation.cs
@@ -33,6 +33,7 @@ public abstract class TreeVisitor_OutputTranslation : TreeVisitor
     {
         protected System.IO.TextWriter _writer;            // writer to output the translated grammar
         protected ITokenStream _tokens;                    // the token stream output from the AbnfAstLexer class
+        protected INamedCharacterLookup _lookup;
 
         protected HashSet<string> _rawTranslatedRuleNames; // remember rule names for later name collision handling
         protected HashSet<IToken> _processedTokens;        // keep track of whitespace/comment tokens which have already been output
@@ -43,10 +44,11 @@ public abstract class TreeVisitor_OutputTranslation : TreeVisitor
         protected int _finalNonWhiteSpaceTokenIndexInRule; // keep track of the final non-whitespace token in the current rule
         int _nestedRepetitionCount = 0;                    // keep track of nested repetitions (for preserving whitespace)
 
-        public TreeVisitor_OutputTranslation(ITokenStream tokens, System.IO.TextWriter writer)
+        public TreeVisitor_OutputTranslation(ITokenStream tokens, System.IO.TextWriter writer, INamedCharacterLookup lookup)
         {
             _tokens = tokens;
             _writer = writer;
+            _lookup = lookup;
 
             CommonConstructor();
         }
@@ -452,31 +454,15 @@ protected void WriteRepetitionNode(ITree node)
                         Write(" (");
                     }
 
-                    for (int count = minValue; count < maxValue; count++)
+                    for (int index = minValue; index < maxValue; index++)
                     {
-                        if (count == minValue)
+                        if (index > minValue)
                         {
-                            Visit(element);
-                            Write("?");
+                            Write(" ");
                         }
-                        else
-                        {
-                            Write(" | ");
-
-                            Write("(");
-
-                            for (int subCount = minValue; subCount <= count; subCount++)
-                            {
-                                if (count > 0)
-                                {
-                                    Write(" ");
-                                }
-
-                                Visit(element);
-                            }
 
-                            Write(")");
-                        }
+                        Visit(element);
+                        Write("?");
                     }
 
                     _nestedRepetitionCount--;
diff --git a/AbnfToAntlr.Common/TreeVisitor_OutputTranslation_Direct.cs b/AbnfToAntlr.Common/TreeVisitor_OutputTranslation_Direct.cs
index 32a2caf..af05561 100644
--- a/AbnfToAntlr.Common/TreeVisitor_OutputTranslation_Direct.cs
+++ b/AbnfToAntlr.Common/TreeVisitor_OutputTranslation_Direct.cs
@@ -36,8 +36,8 @@ public class TreeVisitor_OutputTranslation_Direct : TreeVisitor_OutputTranslatio
     {
         protected List<string> _lexerRules;
 
-        public TreeVisitor_OutputTranslation_Direct(ITokenStream tokens, System.IO.TextWriter writer)
-            : base(tokens, writer)
+        public TreeVisitor_OutputTranslation_Direct(ITokenStream tokens, System.IO.TextWriter writer, INamedCharacterLookup lookup)
+            : base(tokens, writer, lookup)
         {
         }
 
diff --git a/AbnfToAntlr.Common/TreeVisitor_OutputTranslation_Indirect.cs b/AbnfToAntlr.Common/TreeVisitor_OutputTranslation_Indirect.cs
index e85fe8f..557bc85 100644
--- a/AbnfToAntlr.Common/TreeVisitor_OutputTranslation_Indirect.cs
+++ b/AbnfToAntlr.Common/TreeVisitor_OutputTranslation_Indirect.cs
@@ -37,8 +37,8 @@ public class TreeVisitor_OutputTranslation_Indirect : TreeVisitor_OutputTranslat
     {
         Dictionary<char, NamedCharacter> _distinctCharacters;
 
-        public TreeVisitor_OutputTranslation_Indirect(ITokenStream tokens, System.IO.TextWriter writer, Dictionary<char, NamedCharacter> distinctCharacters)
-            : base(tokens, writer)
+        public TreeVisitor_OutputTranslation_Indirect(ITokenStream tokens, System.IO.TextWriter writer, Dictionary<char, NamedCharacter> distinctCharacters, INamedCharacterLookup lookup)
+            : base(tokens, writer, lookup)
         { 
             _distinctCharacters =distinctCharacters;
         }
@@ -68,7 +68,7 @@ protected override void WriteCharValNode(ITree node)
                     Write(" ");
                 }
 
-                var namedCharacter = NamedCharacter.GetNamedCharacter(text[index]);
+                var namedCharacter = _lookup.GetNamedCharacter(text[index]);
                 Write(namedCharacter.Name);
             }
 
@@ -113,7 +113,7 @@ protected override void WriteValueRangeNode(ITree node)
         /// </summary>
         protected override void WriteValue(int value)
         {
-            var namedCharacter = NamedCharacter.GetNamedCharacter((char)value);
+            var namedCharacter = _lookup.GetNamedCharacter((char)value);
 
             Write(namedCharacter.Name);
         }
diff --git a/AbnfToAntlr.Web/AbnfToAntlr.Web.csproj b/AbnfToAntlr.Web/AbnfToAntlr.Web.csproj
index a50c959..a6144d9 100644
--- a/AbnfToAntlr.Web/AbnfToAntlr.Web.csproj
+++ b/AbnfToAntlr.Web/AbnfToAntlr.Web.csproj
@@ -21,6 +21,10 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>4.0</OldToolsVersion>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/AbnfToAntlr.Web/Default.aspx b/AbnfToAntlr.Web/Default.aspx
index 413d830..90847a6 100644
--- a/AbnfToAntlr.Web/Default.aspx
+++ b/AbnfToAntlr.Web/Default.aspx
@@ -17,47 +17,45 @@
     along with AbnfToAntlr.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="AbnfToAntlr.Web.Default" %>
+<%@ Page Language="C#" AutoEventWireup="True" CodeBehind="Default.aspx.cs" Inherits="AbnfToAntlr.Web.DefaultPage" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <title>ABNF to ANTLR</title>
     <style type="text/css">
-        .width_120px
-        {
+        .width_120px {
             width: 120px;
         }
-        .width_100pct
-        {
+
+        .width_100pct {
             width: 100%;
         }
     </style>
 </head>
 <body>
     <form id="form1" runat="server">
-    <h2>
-        ABNF To ANTLR</h2>
-    <p>
-        Translate any ABNF grammar to an ANTLR grammar. The resulting ANTLR grammar should be syntactically correct; however, some ABNF grammars are inherently ambiguous and ANTLR will complain about them until the ambiguity is resolved by the user.  The translator uses parser and lexer components generated by the excellent ANTLR toolset.  Source code and binaries are available on 
-        <a href="https://github.com/rpinchbeck/Abnf-To-Antlr">GitHub</a>.
-    </p>
-    <asp:Label ID="lblInput" runat="server" Text="ABNF&nbsp;Grammar:"></asp:Label>
-    <br />
-    <asp:TextBox ID="txtInput" runat="server" TextMode="MultiLine" MaxLength="1048576" Height="300" Width="100%" Wrap="False"></asp:TextBox>
-    <br />
-    <br />
-    <asp:Button ID="butTranslate" runat="server" Text="Translate" />
-    &nbsp;&nbsp;&nbsp;&nbsp;
-    <asp:CheckBox ID="chkPerformDirectTranslation" runat="server" 
+        <h2>ABNF To ANTLR</h2>
+        <p>
+            Translate any ABNF grammar to an ANTLR grammar. The resulting ANTLR grammar should be syntactically correct; however, some ABNF grammars are inherently ambiguous and ANTLR will complain about them until the ambiguity is resolved by the user.  The translator uses parser and lexer components generated by the excellent ANTLR toolset.  Source code and binaries are available on 
+        <a href="https://github.com/rpinchbeck/Abnf-To-Antlr">GitHub</a>
+        </p>
+        <asp:Label ID="lblInput" runat="server" Text="ABNF&nbsp;Grammar:"></asp:Label>
+        <br />
+        <asp:TextBox ID="txtInput" runat="server" TextMode="MultiLine" MaxLength="1048576" Height="300" Width="100%" Wrap="False"></asp:TextBox>
+        <br />
+        <br />
+        <asp:Button ID="butTranslate" runat="server" Text="Translate" />
+        &nbsp;&nbsp;&nbsp;&nbsp;
+    <asp:CheckBox ID="chkPerformDirectTranslation" runat="server"
         Text="Direct Translation (do not substitute a lexer rule for each distinct character)" />
-    <br />
-    <br />
-    <asp:Label ID="lblOutput" runat="server" Text="ANTLR&nbsp;Grammar:"></asp:Label>
-    <br />
-    <asp:TextBox ID="txtOutput" runat="server" TextMode="MultiLine" ReadOnly="True" Height="300" Width="100%" Wrap="False"></asp:TextBox>
-    <br />
-    <asp:TextBox ID="txtError" runat="server" ForeColor="Red" ReadOnly="True" TextMode="MultiLine" Width="100%"></asp:TextBox>
+        <br />
+        <br />
+        <asp:Label ID="lblOutput" runat="server" Text="ANTLR&nbsp;Grammar:"></asp:Label>
+        <br />
+        <asp:TextBox ID="txtOutput" runat="server" TextMode="MultiLine" ReadOnly="True" Height="300" Width="100%" Wrap="False"></asp:TextBox>
+        <br />
+        <asp:TextBox ID="txtError" runat="server" ForeColor="Red" ReadOnly="True" TextMode="MultiLine" Width="100%"></asp:TextBox>
     </form>
 </body>
 </html>
diff --git a/AbnfToAntlr.Web/Default.aspx.cs b/AbnfToAntlr.Web/Default.aspx.cs
index 3aa75fa..b70265a 100644
--- a/AbnfToAntlr.Web/Default.aspx.cs
+++ b/AbnfToAntlr.Web/Default.aspx.cs
@@ -84,7 +84,7 @@ Official character names from Unicode.org
 
 namespace AbnfToAntlr.Web
 {
-    public partial class Default : System.Web.UI.Page
+    public partial class DefaultPage : System.Web.UI.Page
     {
         protected void Page_Load(object sender, EventArgs e)
         {
@@ -134,5 +134,6 @@ protected void Page_Load(object sender, EventArgs e)
                 this.txtError.Visible = false;
             }
         }
+
     }
 }
\ No newline at end of file
diff --git a/AbnfToAntlr.Web/Default.aspx.designer.cs b/AbnfToAntlr.Web/Default.aspx.designer.cs
index 85dfb06..7e8cc81 100644
--- a/AbnfToAntlr.Web/Default.aspx.designer.cs
+++ b/AbnfToAntlr.Web/Default.aspx.designer.cs
@@ -10,7 +10,7 @@
 namespace AbnfToAntlr.Web {
     
     
-    public partial class Default {
+    public partial class DefaultPage {
         
         /// <summary>
         /// form1 control.
diff --git a/AbnfToAntlr.Web/Properties/AssemblyInfo.cs b/AbnfToAntlr.Web/Properties/AssemblyInfo.cs
index c056f80..0739ac0 100644
--- a/AbnfToAntlr.Web/Properties/AssemblyInfo.cs
+++ b/AbnfToAntlr.Web/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@ You should have received a copy of the GNU General Public License
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
diff --git a/AbnfToAntlr/Program.cs b/AbnfToAntlr/Program.cs
index 7547c19..6af8762 100644
--- a/AbnfToAntlr/Program.cs
+++ b/AbnfToAntlr/Program.cs
@@ -36,7 +36,7 @@ static void ShowSyntax()
             Console.Error.WriteLine("Translate FILE to ANTLR format and write the results to standard output.");
             Console.Error.WriteLine("If --stdin is specified instead of FILE, then standard input is used.");
             Console.Error.WriteLine("If --direct is specified, then a direct translation is performed.");
-            Console.Error.WriteLine("Example: AbnfToAntlr \"AbnfGrammar.txt\" >AntlrGrammar.g");
+            Console.Error.WriteLine("Example: AbnfToAntlr \"AbnfGrammar.txt\" >\"AntlrGrammar.g4\"");
         }
 
         [STAThread]
@@ -47,9 +47,7 @@ static int Main(string[] args)
         {
             if (args.Length == 0)
             {
-                Application.EnableVisualStyles();
-                Application.SetCompatibleTextRenderingDefault(false);
-                Application.Run(new frmMain());
+                WinFormsMain();
                 return 0;
             }
             else
@@ -58,11 +56,18 @@ static int Main(string[] args)
             }
         }
 
+        static void WinFormsMain()
+        {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new frmMain());
+        }
+
         static int ConsoleMain(string[] args)
         {
             bool shouldShowSyntax = false;
             bool shouldPerformDirectTranslation = false;
-            int fileIndex = 0;
+            int fileArgIndex = 0;
 
             if (args.Length == 0)
             {
@@ -84,18 +89,17 @@ static int ConsoleMain(string[] args)
 
                     case "--direct":
                         shouldPerformDirectTranslation = true;
-                        fileIndex = 1;
+                        fileArgIndex = 1;
                         break;
                 }
             }
 
-            if (shouldShowSyntax || fileIndex >= args.Length || args.Length > fileIndex + 1)
+            if (shouldShowSyntax || fileArgIndex >= args.Length || args.Length > fileArgIndex + 1)
             {
                 ShowSyntax();
                 return 1;
             }
 
-
             string path = null;
             System.IO.TextReader reader;
             string input;
@@ -104,7 +108,7 @@ static int ConsoleMain(string[] args)
             try
             {
                 // open input stream
-                if (args[fileIndex] == "--stdin")
+                if (args[fileArgIndex] == "--stdin")
                 {
                     path = "stdin";
                     reader = System.Console.In;
diff --git a/AbnfToAntlr/Properties/AssemblyInfo.cs b/AbnfToAntlr/Properties/AssemblyInfo.cs
index 4eac882..abacc9f 100644
--- a/AbnfToAntlr/Properties/AssemblyInfo.cs
+++ b/AbnfToAntlr/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
diff --git a/AbnfToAntlr/frmMain.Designer.cs b/AbnfToAntlr/frmMain.Designer.cs
index f07ff34..8fa248c 100644
--- a/AbnfToAntlr/frmMain.Designer.cs
+++ b/AbnfToAntlr/frmMain.Designer.cs
@@ -31,10 +31,11 @@ private void InitializeComponent()
             this.txtInput = new System.Windows.Forms.TextBox();
             this.txtOutput = new System.Windows.Forms.TextBox();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.btnTranslate = new System.Windows.Forms.Button();
-            this.chkPerformDirectTranslation = new System.Windows.Forms.CheckBox();
             this.lblInput = new System.Windows.Forms.Label();
+            this.chkPerformDirectTranslation = new System.Windows.Forms.CheckBox();
+            this.btnTranslate = new System.Windows.Forms.Button();
             this.lblOutput = new System.Windows.Forms.Label();
+            this.btnClose = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
@@ -50,7 +51,7 @@ private void InitializeComponent()
             this.txtInput.Multiline = true;
             this.txtInput.Name = "txtInput";
             this.txtInput.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.txtInput.Size = new System.Drawing.Size(454, 125);
+            this.txtInput.Size = new System.Drawing.Size(454, 109);
             this.txtInput.TabIndex = 0;
             // 
             // txtOutput
@@ -63,7 +64,7 @@ private void InitializeComponent()
             this.txtOutput.Name = "txtOutput";
             this.txtOutput.ReadOnly = true;
             this.txtOutput.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.txtOutput.Size = new System.Drawing.Size(454, 130);
+            this.txtOutput.Size = new System.Drawing.Size(454, 117);
             this.txtOutput.TabIndex = 1;
             // 
             // splitContainer1
@@ -86,26 +87,24 @@ private void InitializeComponent()
             // 
             this.splitContainer1.Panel2.Controls.Add(this.lblOutput);
             this.splitContainer1.Panel2.Controls.Add(this.txtOutput);
-            this.splitContainer1.Size = new System.Drawing.Size(460, 338);
-            this.splitContainer1.SplitterDistance = 179;
+            this.splitContainer1.Size = new System.Drawing.Size(460, 309);
+            this.splitContainer1.SplitterDistance = 163;
             this.splitContainer1.TabIndex = 2;
             // 
-            // btnTranslate
+            // lblInput
             // 
-            this.btnTranslate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnTranslate.Location = new System.Drawing.Point(3, 153);
-            this.btnTranslate.Name = "btnTranslate";
-            this.btnTranslate.Size = new System.Drawing.Size(75, 23);
-            this.btnTranslate.TabIndex = 1;
-            this.btnTranslate.Text = "Translate";
-            this.btnTranslate.UseVisualStyleBackColor = true;
-            this.btnTranslate.Click += new System.EventHandler(this.btnTranslate_Click);
+            this.lblInput.AutoSize = true;
+            this.lblInput.Location = new System.Drawing.Point(6, 6);
+            this.lblInput.Name = "lblInput";
+            this.lblInput.Size = new System.Drawing.Size(83, 13);
+            this.lblInput.TabIndex = 3;
+            this.lblInput.Text = "ABNF Grammar:";
             // 
             // chkPerformDirectTranslation
             // 
             this.chkPerformDirectTranslation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.chkPerformDirectTranslation.AutoSize = true;
-            this.chkPerformDirectTranslation.Location = new System.Drawing.Point(84, 157);
+            this.chkPerformDirectTranslation.Location = new System.Drawing.Point(84, 141);
             this.chkPerformDirectTranslation.Name = "chkPerformDirectTranslation";
             this.chkPerformDirectTranslation.Size = new System.Drawing.Size(374, 17);
             this.chkPerformDirectTranslation.TabIndex = 2;
@@ -113,14 +112,16 @@ private void InitializeComponent()
     "";
             this.chkPerformDirectTranslation.UseVisualStyleBackColor = true;
             // 
-            // lblInput
+            // btnTranslate
             // 
-            this.lblInput.AutoSize = true;
-            this.lblInput.Location = new System.Drawing.Point(6, 6);
-            this.lblInput.Name = "lblInput";
-            this.lblInput.Size = new System.Drawing.Size(83, 13);
-            this.lblInput.TabIndex = 3;
-            this.lblInput.Text = "ABNF Grammar:";
+            this.btnTranslate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnTranslate.Location = new System.Drawing.Point(3, 137);
+            this.btnTranslate.Name = "btnTranslate";
+            this.btnTranslate.Size = new System.Drawing.Size(75, 23);
+            this.btnTranslate.TabIndex = 1;
+            this.btnTranslate.Text = "Translate";
+            this.btnTranslate.UseVisualStyleBackColor = true;
+            this.btnTranslate.Click += new System.EventHandler(this.btnTranslate_Click);
             // 
             // lblOutput
             // 
@@ -131,11 +132,25 @@ private void InitializeComponent()
             this.lblOutput.TabIndex = 4;
             this.lblOutput.Text = "ANTLR Grammar:";
             // 
+            // btnClose
+            // 
+            this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnClose.Location = new System.Drawing.Point(397, 327);
+            this.btnClose.Name = "btnClose";
+            this.btnClose.Size = new System.Drawing.Size(75, 23);
+            this.btnClose.TabIndex = 4;
+            this.btnClose.Text = "Close";
+            this.btnClose.UseVisualStyleBackColor = true;
+            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
+            // 
             // frmMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnClose;
             this.ClientSize = new System.Drawing.Size(484, 362);
+            this.Controls.Add(this.btnClose);
             this.Controls.Add(this.splitContainer1);
             this.MinimumSize = new System.Drawing.Size(500, 200);
             this.Name = "frmMain";
@@ -159,6 +174,7 @@ private void InitializeComponent()
         private System.Windows.Forms.Button btnTranslate;
         private System.Windows.Forms.Label lblInput;
         private System.Windows.Forms.Label lblOutput;
+        private System.Windows.Forms.Button btnClose;
     }
 }
 
diff --git a/AbnfToAntlr/frmMain.cs b/AbnfToAntlr/frmMain.cs
index 07fbcb3..7599a23 100644
--- a/AbnfToAntlr/frmMain.cs
+++ b/AbnfToAntlr/frmMain.cs
@@ -75,5 +75,10 @@ private void btnTranslate_Click(object sender, EventArgs e)
                 btnTranslate.Enabled = true;
             }
         }
+
+        private void btnClose_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
     }
 }