Index: trunk/src/tmcsim/cadsimulator/CADServer.java
===================================================================
--- trunk/src/tmcsim/cadsimulator/CADServer.java	(revision 360)
+++ trunk/src/tmcsim/cadsimulator/CADServer.java	(revision 382)
@@ -68,5 +68,5 @@
 {
 
-    private static final String CONFIG_FILE_NAME = "cad_simulator_config.properties";
+    private static String CONFIG_FILE_NAME = "cad_simulator_config.properties";
     /**
      * Error logger.
@@ -425,4 +425,8 @@
             System.setProperty("CONFIG_DIR", "config");
         }
+        if (System.getProperty("PROP_FILE") != null)
+        {
+            CONFIG_FILE_NAME = System.getProperty("PROP_FILE");
+        }
         try
         {
Index: trunk/src/tmcsim/application.properties
===================================================================
--- trunk/src/tmcsim/application.properties	(revision 376)
+++ trunk/src/tmcsim/application.properties	(revision 382)
@@ -1,5 +1,5 @@
-#Tue, 16 Apr 2019 11:04:30 -0700
+#Wed, 17 Apr 2019 10:55:08 -0700
 
-Application.revision=372
+Application.revision=381
 
-Application.buildnumber=132
+Application.buildnumber=134
Index: trunk/src/tmcsim/simulationmanager/SimulationManager.java
===================================================================
--- trunk/src/tmcsim/simulationmanager/SimulationManager.java	(revision 47)
+++ trunk/src/tmcsim/simulationmanager/SimulationManager.java	(revision 382)
@@ -215,9 +215,28 @@
             System.setProperty("CONFIG_DIR", "config");
         }
-
+        SimulationManager app;
         try
         {
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-            new SimulationManager(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
+            app = new SimulationManager(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
+            // Check if a script filename has been given as an argument
+            String arg1;
+            if (args.length > 0)
+            {
+                arg1 = args[0];
+                File scriptFile = new File("scripts"+ System.getProperty("file.separator") + arg1);
+                if (scriptFile.exists())
+                {
+                    app.loadScript(scriptFile);
+                    simManLogger.logp(Level.INFO,"SimulationManager","Main",
+                            "Sim Mgr starting with script file: " + arg1 + ".");
+                }
+                else
+                {
+                    simManLogger.logp(Level.INFO,"SimulationManager","Main",
+                            "Script file not found: " + arg1 +
+                            ". Starting with no script.");
+                }
+            }
         } catch (Exception e)
         {
@@ -230,5 +249,4 @@
             System.exit(-1);
         }
-
     }
 }