Index: trunk/src/tmcsim/paramicscommunicator/ParamicsCommunicator.java
===================================================================
--- trunk/src/tmcsim/paramicscommunicator/ParamicsCommunicator.java	(revision 26)
+++ trunk/src/tmcsim/paramicscommunicator/ParamicsCommunicator.java	(revision 33)
@@ -19,8 +19,11 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+
 import tmcsim.common.CADProtocol.PARAMICS_ACTIONS;
 import tmcsim.common.CADProtocol.PARAMICS_COMM_TAGS;
@@ -60,5 +63,6 @@
 {
 
-    /**
+    private static final String CONFIG_FILE_NAME = "paramics_communicator_config.properties";
+	/**
      * Error logger.
      */
@@ -480,22 +484,15 @@
      * @param args Command line arguments.
      */
-    public static void main(String[] args)
-    {
-        System.setProperty("PARAMICS_COMM_PROPERTIES", "config/paramics_communicator_config.properties");
-
-        try
-        {
-            if (System.getProperty("PARAMICS_COMM_PROPERTIES") != null)
-            {
-                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-
-                new Thread(new ParamicsCommunicator(System.getProperty(
-                        "PARAMICS_COMM_PROPERTIES"))).start();
-            } else
-            {
-                throw new Exception("PARAMICS_COMM_PROPERTIES system property not defined.");
-            }
-        } catch (Exception e)
-        {
+    public static void main(String[] args) {
+    	if(System.getProperty("CONFIG_DIR") == null){
+        	System.setProperty("CONFIG_DIR", "config");
+        }
+    	
+        try{
+
+        	UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            new Thread(new ParamicsCommunicator(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME)).start();
+        
+        } catch (Exception e) {
             paramLogger.logp(Level.SEVERE, "ParamicsCommunicator", "Main",
                     "Error occured initializing application", e);