diff --git a/.gitignore b/.gitignore
index 6867976..0ab20ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 build*/*
 *.so
 public/
+*.exe
 
 # Eclispe setting --- do not ignore *.cproject and *.project
 */**/.settings
diff --git a/examples/cs/main.cs b/examples/cs/main.cs
index a26a762..086fa1a 100644
--- a/examples/cs/main.cs
+++ b/examples/cs/main.cs
@@ -35,12 +35,8 @@ using System.Runtime.InteropServices;
 public class Tester 
 {
 
-
-#if UNIX
-    [DllImport("libopenGJKlib.so", EntryPoint="csFunction", CallingConvention = CallingConvention.StdCall)]
-#else 
-    [DllImport("openGJKlib", EntryPoint = "csFunction", CallingConvention = CallingConvention.StdCall)]
-#endif
+    [DllImport("libopenGJKlib", EntryPoint="csFunction", CallingConvention = CallingConvention.StdCall)]
+ 
     static extern double gjk(int na, double [,] ia, int nb, double [,] ib);
 
         public static void Main(string[] args)
diff --git a/examples/matlab/runme.m b/examples/matlab/runme.m
index 4301725..ff6e21c 100644
--- a/examples/matlab/runme.m
+++ b/examples/matlab/runme.m
@@ -52,10 +52,10 @@ end
 % TRY COMPILING MEX FILE
 fprintf('Compiling mex function... ')
 try
-mex(fullfile('..','..','lib','src','openGJK.c'),...  % Source of openGJK 
+mex(fullfile('..','..','src','openGJK.c'),...  % Source of openGJK 
     '-largeArrayDims', ...      % Support large arrays
     optflug, ...                % Compiler flag for debug/optimisation
-    fullfile('-I..','..','lib','include'),...      % Folder to header files
+    fullfile('-I..','..','include'),...      % Folder to header files
     '-outdir', pwd,...          % Ouput directory for writing mex function
     '-output', 'openGJK',...    % Name of ouput mex file
     '-DMATLABDOESMEXSTUFF',...  % Define variable for mex function in source files