diff --git a/.gitignore b/.gitignore
index 90f6ee371..bf29b9851 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,7 @@ Java/bin
 *.pyc
 *.m~
 *.log
+data
+dist
+data/*
+dist/*
diff --git a/GUI/mainWindow.m b/GUI/mainWindow.m
index f262955d0..baf944604 100644
--- a/GUI/mainWindow.m
+++ b/GUI/mainWindow.m
@@ -287,7 +287,7 @@ function mainWindow(windowTitle, sample_data, states, startState, selectionCallb
         'HandleVisibility', 'off', ...
         'OnCallback', @onZoomIn, ...
         'OffCallback', 'zoom(''off'')');
-    [img,map,alpha] = imread(fullfile(matlabroot,'toolbox','matlab','icons','tool_zoom_in.png'));
+    [img,map,alpha] = imread(fullfile(matlabroot,'mcr','toolbox','matlab','icons','tool_zoom_in.png'));
     img = double(img)/double(intmax(class(img)));
     img(repmat(alpha==0,[1 1 3])) = NaN;
     zoominb.CData = img;
@@ -297,7 +297,7 @@ function mainWindow(windowTitle, sample_data, states, startState, selectionCallb
         'HandleVisibility', 'off', ...
         'OnCallback', @onZoomOut, ...
         'OffCallback', 'zoom(''off'')');
-    [img,map,alpha] = imread(fullfile(matlabroot,'toolbox','matlab','icons','tool_zoom_out.png'));
+    [img,map,alpha] = imread(fullfile(matlabroot,'mcr','toolbox','matlab','icons','tool_zoom_out.png'));
     img = double(img)/double(intmax(class(img)));
     img(repmat(alpha==0,[1 1 3])) = NaN;
     zoomoutb.CData = img;
@@ -307,7 +307,7 @@ function mainWindow(windowTitle, sample_data, states, startState, selectionCallb
         'HandleVisibility', 'off', ...
         'OnCallback', 'pan(''on'')', ...
         'OffCallback', 'pan(''off'')');
-    [img,map,alpha] = imread(fullfile(matlabroot,'toolbox','matlab','icons','tool_hand.png'));
+    [img,map,alpha] = imread(fullfile(matlabroot,'mcr','toolbox','matlab','icons','tool_hand.png'));
     img = double(img)/double(intmax(class(img)));
     img(repmat(alpha==0,[1 1 3])) = NaN;
     hPan.CData = img;
diff --git a/Java/ddb.jar b/Java/ddb.jar
index ddf76c603..7ab1b55b0 100644
Binary files a/Java/ddb.jar and b/Java/ddb.jar differ
diff --git a/imosToolboxBatch_Win32.bat b/imosToolboxBatch_Win32.bat
deleted file mode 100644
index 3e9762b87..000000000
--- a/imosToolboxBatch_Win32.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-imosToolbox_Win32.exe auto
-pause
\ No newline at end of file
diff --git a/imosToolbox_Linux64.bin b/imosToolbox_Linux64.bin
index d1f8fd527..312593355 100755
Binary files a/imosToolbox_Linux64.bin and b/imosToolbox_Linux64.bin differ
diff --git a/imosToolbox_Win32.bat b/imosToolbox_Win32.bat
deleted file mode 100644
index 1a09ecbbf..000000000
--- a/imosToolbox_Win32.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-imosToolbox_Win32.exe
-pause
\ No newline at end of file
diff --git a/imosToolbox_Win32.exe b/imosToolbox_Win32.exe
deleted file mode 100644
index cdb633612..000000000
Binary files a/imosToolbox_Win32.exe and /dev/null differ
diff --git a/imosToolbox_Win64.exe b/imosToolbox_Win64.exe
index 64b3a296d..525c44087 100644
Binary files a/imosToolbox_Win64.exe and b/imosToolbox_Win64.exe differ