diff --git a/src/com/webcodepro/applecommander/ui/AppleCommander.java b/src/com/webcodepro/applecommander/ui/AppleCommander.java
index 6570f8c..b0e24bf 100644
--- a/src/com/webcodepro/applecommander/ui/AppleCommander.java
+++ b/src/com/webcodepro/applecommander/ui/AppleCommander.java
@@ -40,7 +40,7 @@ import com.webcodepro.applecommander.util.TextBundle;
  * @author Rob Greene
  */
 public class AppleCommander {
-	public static final String VERSION = "1.3.5.13"; //$NON-NLS-1$
+	public static final String VERSION = "1.3.5.14"; //$NON-NLS-1$
 	private static TextBundle textBundle = UiBundle.getInstance();
 	/**
 	 * Launch AppleCommander.
diff --git a/src/com/webcodepro/applecommander/ui/swt/SwtAppleCommander.java b/src/com/webcodepro/applecommander/ui/swt/SwtAppleCommander.java
index f71629a..06f5c83 100644
--- a/src/com/webcodepro/applecommander/ui/swt/SwtAppleCommander.java
+++ b/src/com/webcodepro/applecommander/ui/swt/SwtAppleCommander.java
@@ -118,7 +118,7 @@ public class SwtAppleCommander implements Listener {
 		GridLayout gridLayout = new GridLayout();
 		gridLayout.marginHeight = 5;
 		gridLayout.marginWidth = 5;
-		shell.setLayout(gridLayout);
+		shell.setLayout(gridLayout);	
 
 		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
 		gridData.grabExcessHorizontalSpace = true;
@@ -144,6 +144,9 @@ public class SwtAppleCommander implements Listener {
 		imageCanvas.dispose();
 		toolBar.dispose();
 		imageManager.dispose();
+        if (System.getProperty("os.name").startsWith("Mac OS X")) {
+    		System.exit(0);
+        }
 	}
 	
 	/**