diff --git a/GSWeb.framework/GSWApplication.h b/GSWeb.framework/GSWApplication.h
index 79fcb87..36d54d9 100644
--- a/GSWeb.framework/GSWApplication.h
+++ b/GSWeb.framework/GSWApplication.h
@@ -536,6 +536,8 @@ extern BOOL WOStrictFlag;
 +(void)setDebugSetConfigFilePath:(NSString*)debugSetConfigFilePath;//NDFN
 +(NSString*)saveResponsesPath;//NDFN
 +(void)setSaveResponsesPath:(NSString*)saveResponsesPath;//NDFN
++(NSString*)defaultTemplateParser;//NDFN
++(void)setDefaultTemplateParser:(NSString*)defaultTemplateParser;//NDFN
 @end
 
 //====================================================================
diff --git a/GSWeb.framework/GSWApplication.m b/GSWeb.framework/GSWApplication.m
index 33106f2..051f634 100644
--- a/GSWeb.framework/GSWApplication.m
+++ b/GSWeb.framework/GSWApplication.m
@@ -329,6 +329,8 @@ int GSWApplicationMainReal(NSString* applicationClassName,
                        GSWOPTVALUE_AdaptorHost);
           NSDebugFLLog(@"options",@"GSWOPTVALUE_SaveResponsesPath -> %@",
                        GSWOPTVALUE_SaveResponsesPath);
+          NSDebugFLLog(@"options",@"DefaultTemplateParser -> %@",
+                       GSWOPTVALUE_DefaultTemplateParser);
 
           defaultsOptions = 
             [NSDictionary dictionaryWithObjectsAndKeys:
@@ -359,6 +361,7 @@ int GSWApplicationMainReal(NSString* applicationClassName,
                           GSWOPTVALUE_MultiThreadEnabled,			GSWOPT_MultiThreadEnabled,
                           GSWOPTVALUE_AdaptorHost,			        GSWOPT_AdaptorHost[GSWebNamingConv],
                           GSWOPTVALUE_SaveResponsesPath,			GSWOPT_SaveResponsesPath[GSWebNamingConv],
+                          GSWOPTVALUE_DefaultTemplateParser,			GSWOPT_DefaultTemplateParser[GSWebNamingConv],
                           nil,										nil];
           NSDebugFLLog(@"options",@"_globalAppDefaultOptions=%@",globalAppDefaultOptions);
           globalAppDefaultOptions=[NSDictionary dictionaryWithDictionary:globalAppDefaultOptions
@@ -4174,6 +4177,21 @@ selfLockn,
     forKey:GSWOPT_SaveResponsesPath[GSWebNamingConv]];
 };
 
+/** Returns the default template parser option **/
++(NSString*)defaultTemplateParser
+{
+  return [[NSUserDefaults standardUserDefaults] 
+           objectForKey:GSWOPT_DefaultTemplateParser[GSWebNamingConv]];
+};
+
+//--------------------------------------------------------------------
++(void)setDefaultTemplateParser:(NSString*)defaultTemplateParser
+{
+  [[NSUserDefaults standardUserDefaults] 
+    setObject:defaultTemplateParser
+    forKey:GSWOPT_DefaultTemplateParser[GSWebNamingConv]];
+};
+
 @end