Index: trunk/src/tmcsim/paramicscommunicator/ParamicsCommunicator.java
===================================================================
--- trunk/src/tmcsim/paramicscommunicator/ParamicsCommunicator.java	(revision 25)
+++ trunk/src/tmcsim/paramicscommunicator/ParamicsCommunicator.java	(revision 26)
@@ -74,5 +74,6 @@
 
         SOCKET_PORT("SocketPort"),
-        WORKING_DIR("WorkingDirectory");
+        WORKING_DIR("WorkingDirectory"),
+        GUI_VISIBLE("GUIvisible");
         public String name;
 
@@ -139,44 +140,4 @@
         readers = new TreeMap<String, ParamicsFileReader>();
 
-        theGUI = new ParamicsCommunicatorGUI();
-        addObserver(theGUI);
-        theGUI.addWindowListener(new WindowListener()
-        {
-            public void windowActivated(WindowEvent arg0)
-            {
-            }
-
-            ;
-            public void windowClosed(WindowEvent arg0)
-            {
-            }
-
-            ;
-            public void windowClosing(WindowEvent arg0)
-            {
-                System.exit(0);
-            }
-
-            public void windowDeactivated(WindowEvent arg0)
-            {
-            }
-
-            ;
-            public void windowDeiconified(WindowEvent arg0)
-            {
-            }
-
-            ;
-            public void windowIconified(WindowEvent arg0)
-            {
-            }
-
-            ;
-            public void windowOpened(WindowEvent arg0)
-            {
-            }
-        ;
-        });
-
         try
         {
@@ -247,4 +208,13 @@
         }
 
+        // Should we display the GUI?
+        String visibleProp = paramicsCommProp.getProperty(PROPERTIES.GUI_VISIBLE.name);
+        // If no property was given, or if it was given and says True
+        if (visibleProp == null || (visibleProp.toLowerCase().equals("true")))
+        {
+            theGUI = new ParamicsCommunicatorGUI(); // it sets itself visible
+            addObserver(theGUI);
+            theGUI.setDefaultCloseOperation(javax.swing.JFrame.EXIT_ON_CLOSE);
+        }
 
         try