diff --git a/build3/xcode.command b/build3/xcode.command
deleted file mode 100755
index 52a4a4a7c..000000000
--- a/build3/xcode.command
+++ /dev/null
@@ -1,4 +0,0 @@
-
-cd `dirname $0`
-./premake4_osx xcode4
-
diff --git a/build_and_run_cmake.sh b/build_and_run_cmake.sh
new file mode 100755
index 000000000..1405060f4
--- /dev/null
+++ b/build_and_run_cmake.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+rm CMakeCache.txt
+mkdir build_cmake
+cd build_cmake
+cmake ..
+make -j12
+examples/ExampleBrowser/App_ExampleBrowser
diff --git a/build_and_run_premake.sh b/build_and_run_premake.sh
new file mode 100755
index 000000000..ba43a6a17
--- /dev/null
+++ b/build_and_run_premake.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+cd build3
+./premake4_linux64 gmake
+./premake4_osx gmake
+cd gmake
+make -j12
+../../bin/App_BulletExampleBrowser_gmake_x64_release
diff --git a/build3/vs2010.bat b/build_visual_studio.bat
similarity index 89%
rename from build3/vs2010.bat
rename to build_visual_studio.bat
index 7bca3cf71..de3b886c9 100644
--- a/build3/vs2010.bat
+++ b/build_visual_studio.bat
@@ -1,6 +1,7 @@
 
 rem premake4 --with-pe  vs2010
 rem premake4  --bullet2demos vs2010
+cd build3
 premake4   --targetdir="../bin" vs2010 
 rem premake4   --targetdir="../server2bin" vs2010 
 rem cd vs2010
@@ -13,6 +14,6 @@ rem cd vs2010
 rem rename 0_Bullet3Solution.sln 0_client.sln
 rem cd ..
 rem rename vs2010 vs2010_client
+start vs2010/0_Bullet3Solution.sln
 
-
-pause
\ No newline at end of file
+pause
diff --git a/data/cube.mtl b/data/cube.mtl
index aba4ddc5b..fca828974 100644
--- a/data/cube.mtl
+++ b/data/cube.mtl
@@ -10,5 +10,5 @@ newmtl cube
   Ks 0.0000 0.0000 0.0000
   Ke 0.0000 0.0000 0.0000
   map_Ka cube.tga
-  map_Kd cube_diffuse.tga
+  map_Kd floor_diffuse.tga
 
diff --git a/examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp b/examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp
index 810099bae..3f6553b81 100644
--- a/examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp
+++ b/examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp
@@ -95,7 +95,7 @@ int b3ImportMeshUtility::loadAndRegisterMeshFromFile(const std::string& fileName
 	b3ImportMeshData meshData;
 	if (b3ImportMeshUtility::loadAndRegisterMeshFromFileInternal(fileName, meshData))
 	{
-		int textureIndex = 0;
+		int textureIndex = -1;
 
 		if (meshData.m_textureImage)
 		{
diff --git a/examples/Importers/ImportURDFDemo/BulletUrdfImporter.cpp b/examples/Importers/ImportURDFDemo/BulletUrdfImporter.cpp
index d0238abea..1aac66af3 100644
--- a/examples/Importers/ImportURDFDemo/BulletUrdfImporter.cpp
+++ b/examples/Importers/ImportURDFDemo/BulletUrdfImporter.cpp
@@ -585,7 +585,7 @@ btCollisionShape* convertURDFToCollisionShape(const UrdfCollision* collision, co
 	return shape;
 }
 
-int BulletURDFImporter::convertLinkVisualShapes(int linkIndex, const char* pathPrefix, const btTransform& localInertiaFrame, class btCollisionShape* colShape) const
+int BulletURDFImporter::convertLinkVisualShapes2(int linkIndex, const char* pathPrefix, const btTransform& localInertiaFrame, class btCollisionShape* colShape) const
 {
 	int graphicsIndex = -1;
 
diff --git a/examples/Importers/ImportURDFDemo/BulletUrdfImporter.h b/examples/Importers/ImportURDFDemo/BulletUrdfImporter.h
index 469c5a43c..c1a2b7c41 100644
--- a/examples/Importers/ImportURDFDemo/BulletUrdfImporter.h
+++ b/examples/Importers/ImportURDFDemo/BulletUrdfImporter.h
@@ -46,7 +46,7 @@ public:
     
     virtual bool getRootTransformInWorld(btTransform& rootTransformInWorld) const;
 
-	virtual int convertLinkVisualShapes(int linkIndex, const char* pathPrefix, const btTransform& localInertiaFrame, class btCollisionShape* colShape) const;
+    virtual int convertLinkVisualShapes2(int linkIndex, const char* pathPrefix, const btTransform& inertialFrame, class btCollisionShape* colShape) const;
 
     ///todo(erwincoumans) refactor this convertLinkCollisionShapes/memory allocation
     
diff --git a/examples/Importers/ImportURDFDemo/URDF2Bullet.cpp b/examples/Importers/ImportURDFDemo/URDF2Bullet.cpp
index 140cce62c..e3deca4cd 100644
--- a/examples/Importers/ImportURDFDemo/URDF2Bullet.cpp
+++ b/examples/Importers/ImportURDFDemo/URDF2Bullet.cpp
@@ -213,7 +213,7 @@ void ConvertURDF2BulletInternal(const URDFImporterInterface& u2b, MultiBodyCreat
 
     btCompoundShape* compoundShape = u2b.convertLinkCollisionShapes(urdfLinkIndex,pathPrefix,localInertialFrame);
 	
-	int graphicsIndex = u2b.convertLinkVisualShapes(urdfLinkIndex,pathPrefix,localInertialFrame,compoundShape);
+	int graphicsIndex = u2b.convertLinkVisualShapes2(urdfLinkIndex,pathPrefix,localInertialFrame,compoundShape);
 
 
     if (compoundShape)
diff --git a/examples/Importers/ImportURDFDemo/URDFImporterInterface.h b/examples/Importers/ImportURDFDemo/URDFImporterInterface.h
index 25b1769dd..a5203d651 100644
--- a/examples/Importers/ImportURDFDemo/URDFImporterInterface.h
+++ b/examples/Importers/ImportURDFDemo/URDFImporterInterface.h
@@ -42,7 +42,9 @@ public:
     virtual bool getRootTransformInWorld(btTransform& rootTransformInWorld) const =0;
     
 	///quick hack: need to rethink the API/dependencies of this
-	virtual int convertLinkVisualShapes(int linkIndex, const char* pathPrefix, const btTransform& inertialFrame, class btCollisionShape* colShape) const = 0;
+    virtual int convertLinkVisualShapes(int linkIndex, const char* pathPrefix, const btTransform& inertialFrame) const { return -1;}
+    
+    virtual int convertLinkVisualShapes2(int linkIndex, const char* pathPrefix, const btTransform& inertialFrame, class btCollisionShape* colShape) const = 0;
 
 	virtual class btCompoundShape* convertLinkCollisionShapes(int linkIndex, const char* pathPrefix, const btTransform& localInertiaFrame) const  = 0;
 };
diff --git a/xcode.command b/xcode.command
new file mode 100755
index 000000000..e5ab2fc23
--- /dev/null
+++ b/xcode.command
@@ -0,0 +1,5 @@
+
+cd `dirname $0`
+cd build3
+./premake4_osx xcode4
+open xcode4/0_Bullet3Solution.xcworkspace