Index: trunk/src/tmcsim/cadsimulator/CADSimulator.java
===================================================================
--- trunk/src/tmcsim/cadsimulator/CADSimulator.java	(revision 5)
+++ trunk/src/tmcsim/cadsimulator/CADSimulator.java	(revision 33)
@@ -135,4 +135,5 @@
     private Properties cadSimulatorProperties;  
     
+    private static final String CONFIG_FILE_NAME = "cad_simulator_config.properties";
 
     /**
@@ -329,18 +330,10 @@
      */
     public static void main(String[] args) {
-        System.setProperty("CAD_SIM_PROPERTIES",  "config/cad_simulator_config.properties");
-        
-        try 
-        {
-            if(System.getProperty("CAD_SIM_PROPERTIES") != null)
-            {
-                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-                
-                new CADSimulator(System.getProperty("CAD_SIM_PROPERTIES"));
-            }
-            else
-            {
-                throw new Exception ("CAD_SIM_PROPERTIES system property not defined.");
-            }
+        if(System.getProperty("CONFIG_DIR") == null){
+        	System.setProperty("CONFIG_DIR", "config");
+        }
+        try {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+           new CADSimulator(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
         }
         catch (Exception e) {