diff --git a/build3/findOpenGLGlewGlut.lua b/build3/findOpenGLGlewGlut.lua
index 38fefd593..230424021 100644
--- a/build3/findOpenGLGlewGlut.lua
+++ b/build3/findOpenGLGlewGlut.lua
@@ -54,6 +54,13 @@
 			}
 			files { projectRootDir .. "examples/ThirdPartyLibs/glad/glad.c"}
 		end
+		if os.is("MacOSX") then
+			 includedirs {
+                                        projectRootDir .. "examples/ThirdPartyLibs/glad"
+                                }
+                                files { projectRootDir .. "examples/ThirdPartyLibs/glad/glad.c"}
+		end
+
 		if os.is("Linux") then
 			configuration{"Linux"}
 				print("Using glad and dynamic loading of glx functions")
diff --git a/examples/OpenGLWindow/MacOpenGLWindowObjC.m b/examples/OpenGLWindow/MacOpenGLWindowObjC.m
index 921960df9..9b6edfdc8 100644
--- a/examples/OpenGLWindow/MacOpenGLWindowObjC.m
+++ b/examples/OpenGLWindow/MacOpenGLWindowObjC.m
@@ -402,7 +402,9 @@ int Mac_createWindow(struct MacOpenGLWindowInternalData* m_internalData,struct M
     ///ci.m_resizeCallback];
     
     [m_internalData->m_myview initWithFrame: frame];
-    
+   
+ 
+ 
     // OpenGL init!
     [m_internalData->m_myview MakeContext : ci->m_openglVersion];
     
@@ -481,6 +483,11 @@ int Mac_createWindow(struct MacOpenGLWindowInternalData* m_internalData,struct M
     [m_internalData->m_myApp finishLaunching];
     [pool release];
     
+    if(!gladLoadGL()) {
+        printf("gladLoadGL failed!\n");
+        exit(-1);
+    }
+    
     return 0;
 }
 
diff --git a/setup.py b/setup.py
index 34d5b3300..e553704e3 100644
--- a/setup.py
+++ b/setup.py
@@ -388,7 +388,7 @@ if _platform == "linux" or _platform == "linux2":
     CXX_FLAGS += '-fno-inline-functions-called-once'
     sources = sources + ["examples/ThirdPartyLibs/enet/unix.c"]\
     +["examples/OpenGLWindow/X11OpenGLWindow.cpp"]\
-    +["examples/ThirdPartyLibs/Glew/glew.c"]
+    +["examples/ThirdPartyLibs/glad/glad.c"]
     include_dirs += ["examples/ThirdPartyLibs/optionalX11"]
 elif _platform == "win32":
     print("win32!")
@@ -398,7 +398,7 @@ elif _platform == "win32":
     sources = sources + ["examples/ThirdPartyLibs/enet/win32.c"]\
     +["examples/OpenGLWindow/Win32Window.cpp"]\
     +["examples/OpenGLWindow/Win32OpenGLWindow.cpp"]\
-    +["examples/ThirdPartyLibs/Glew/glew.c"]
+    +["examples/ThirdPartyLibs/glad/glad.c"]
 elif _platform == "darwin":
     print("darwin!")
     os.environ['LDFLAGS'] = '-framework Cocoa -framework OpenGL'
@@ -408,6 +408,7 @@ elif _platform == "darwin":
 #    CXX_FLAGS += '-framework Cocoa '
     sources = sources + ["examples/ThirdPartyLibs/enet/unix.c"]\
     +["examples/OpenGLWindow/MacOpenGLWindow.cpp"]\
+    +["examples/ThirdPartyLibs/glad/glad.c"]\
     +["examples/OpenGLWindow/MacOpenGLWindowObjC.m"]
 else:
     print("bsd!")
@@ -419,7 +420,7 @@ else:
     CXX_FLAGS += '-fno-inline-functions-called-once'
     sources = ["examples/ThirdPartyLibs/enet/unix.c"]\
     +["examples/OpenGLWindow/X11OpenGLWindow.cpp"]\
-    +["examples/ThirdPartyLibs/Glew/glew.c"]\
+    +["examples/ThirdPartyLibs/glad/glad.c"]\
     + sources
 
 setup_py_dir = os.path.dirname(os.path.realpath(__file__))
@@ -457,7 +458,7 @@ setup(
 	sources =  sources,
 	libraries = libraries,
 	extra_compile_args=CXX_FLAGS.split(),
-	include_dirs = include_dirs + ["src","examples/ThirdPartyLibs","examples/ThirdPartyLibs/Glew", "examples/ThirdPartyLibs/enet/include","examples/ThirdPartyLibs/clsocket/src"]
+	include_dirs = include_dirs + ["src","examples/ThirdPartyLibs","examples/ThirdPartyLibs/glad", "examples/ThirdPartyLibs/enet/include","examples/ThirdPartyLibs/clsocket/src"]
      ) ],
      classifiers=['Development Status :: 5 - Production/Stable',
                    'License :: OSI Approved :: zlib/libpng License',