diff --git a/tclCommands/TclCommandExportGcode.py b/tclCommands/TclCommandExportGcode.py
index feecd870..b1a55d98 100644
--- a/tclCommands/TclCommandExportGcode.py
+++ b/tclCommands/TclCommandExportGcode.py
@@ -4,7 +4,7 @@ import TclCommand
 
 class TclCommandExportGcode(TclCommand.TclCommandSignaled):
     """
-    Tcl shell command to export gcode as  tcl output for "set X [export_gcode ...]"
+    Tcl shell command to export gcode as tcl output for "set X [export_gcode ...]"
 
     Requires name to be available. It might still be in the
     making at the time this function is called, so check for
diff --git a/tclCommands/TclCommandWriteGCode.py b/tclCommands/TclCommandWriteGCode.py
index 4733bf82..5b898bc1 100644
--- a/tclCommands/TclCommandWriteGCode.py
+++ b/tclCommands/TclCommandWriteGCode.py
@@ -21,7 +21,8 @@ class TclCommandWriteGCode(TclCommand.TclCommandSignaled):
     # Dictionary of types from Tcl command, needs to be ordered.
     # For options like -optionname value
     option_types = collections.OrderedDict([
-
+        ('preamble', str),
+        ('postamble', str)
     ])
 
     # array of mandatory options for current Tcl command: required = {'name','outname'}
@@ -32,7 +33,9 @@ class TclCommandWriteGCode(TclCommand.TclCommandSignaled):
         'main': "Saves G-code of a CNC Job object to file.",
         'args': collections.OrderedDict([
             ('name', 'Source CNC Job object.'),
-            ('filename', 'Output filename'),
+            ('filename', 'Output filename.'),
+            ('preamble', 'Text to append at the beginning.'),
+            ('postamble', 'Text to append at the end.')
         ]),
         'examples': []
     }
@@ -56,8 +59,8 @@ class TclCommandWriteGCode(TclCommand.TclCommandSignaled):
         obj_name = args['name']
         filename = args['filename']
 
-        preamble = ''
-        postamble = ''
+        preamble = args['preamble'] if 'preamble' in args else ''
+        postamble = args['postamble'] if 'postamble' in args else ''
 
         # TODO: This is not needed any more? All targets should be present.
         # If there are promised objects, wait until all promises have been fulfilled.