diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1acafce20..93c59db3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,4 +69,9 @@ IF(BUILD_EXTRAS)
   SUBDIRS(Extras)
 ENDIF(BUILD_EXTRAS)
 
+#INSTALL of other files requires CMake 2.6
+IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+	OPTION(INSTALL_EXTRA_LIBS "Set when you want extra libraries installed" OFF)
+ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+
 SUBDIRS(src)
diff --git a/Demos/BasicDemo/BasicDemo.cpp b/Demos/BasicDemo/BasicDemo.cpp
index 67a54ff95..fd6223aac 100644
--- a/Demos/BasicDemo/BasicDemo.cpp
+++ b/Demos/BasicDemo/BasicDemo.cpp
@@ -174,7 +174,7 @@ void	BasicDemo::initPhysics()
 					btDefaultMotionState* myMotionState = new btDefaultMotionState(startTransform);
 					btRigidBody::btRigidBodyConstructionInfo rbInfo(mass,myMotionState,colShape,localInertia);
 					btRigidBody* body = new btRigidBody(rbInfo);
-					//body->setContactProcessingThreshold(colShape->getContactBreakingThreshold());
+					
 					body->setActivationState(ISLAND_SLEEPING);
 
 					m_dynamicsWorld->addRigidBody(body);
diff --git a/Demos/OpenGL/CMakeLists.txt b/Demos/OpenGL/CMakeLists.txt
index f8e9e2b17..376cbeec6 100644
--- a/Demos/OpenGL/CMakeLists.txt
+++ b/Demos/OpenGL/CMakeLists.txt
@@ -33,3 +33,15 @@ ADD_LIBRARY(OpenGLSupport
 IF (BUILD_SHARED_LIBS)
   TARGET_LINK_LIBRARIES(OpenGLSupport BulletDynamics BulletCollision ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
 ENDIF (BUILD_SHARED_LIBS)
+
+#INSTALL of other files requires CMake 2.6
+IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+	IF(INSTALL_EXTRA_LIBS)
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			INSTALL(TARGETS OpenGLSupport DESTINATION .)
+		ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		INSTALL(TARGETS OpenGLSupport DESTINATION lib)
+			INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (INSTALL_EXTRA_LIBS)
+ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
diff --git a/Demos/OpenGL/GL_DialogDynamicsWorld.cpp b/Demos/OpenGL/GL_DialogDynamicsWorld.cpp
index a0a5ae529..7ac3272c9 100644
--- a/Demos/OpenGL/GL_DialogDynamicsWorld.cpp
+++ b/Demos/OpenGL/GL_DialogDynamicsWorld.cpp
@@ -200,7 +200,6 @@ GL_DialogWindow*	GL_DialogDynamicsWorld::createDialog(int horPos,int vertPos,int
 	body->setWorldTransform(trans);
 	body->setDamping(0.999,0.99);
 
-	//body->setContactProcessingThreshold(colShape->getContactBreakingThreshold());
 	//body->setActivationState(ISLAND_SLEEPING);
 	body->setLinearFactor(btVector3(1,1,0));
 	//body->setAngularFactor(btVector3(0,0,1));
@@ -229,7 +228,6 @@ GL_SliderControl* GL_DialogDynamicsWorld::createSlider(GL_DialogWindow* dialog,
 	body->setWorldTransform(trans);
 	//body->setDamping(0.999,0.99);
 
-	//body->setContactProcessingThreshold(colShape->getContactBreakingThreshold());
 	//body->setActivationState(ISLAND_SLEEPING);
 	body->setLinearFactor(btVector3(1,1,0));
 	//body->setAngularFactor(btVector3(0,0,1));
@@ -292,7 +290,6 @@ GL_ToggleControl* GL_DialogDynamicsWorld::createToggle(GL_DialogWindow* dialog,
 	body->setWorldTransform(trans);
 	body->setDamping(0.999,0.99);
 
-	//body->setContactProcessingThreshold(colShape->getContactBreakingThreshold());
 	//body->setActivationState(ISLAND_SLEEPING);
 	body->setLinearFactor(btVector3(1,1,0));
 	//body->setAngularFactor(btVector3(0,0,1));
diff --git a/Doxyfile b/Doxyfile
index 2f9a6b27e..175002655 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -718,6 +718,11 @@ MAX_DOT_GRAPH_HEIGHT   = 1024
 
 GENERATE_LEGEND        = YES
 
+
+# delete intermediate dot files?
+
+DOT_CLEANUP = YES
+
 #---------------------------------------------------------------------------
 # Configuration::addtions related to the search engine   
 #---------------------------------------------------------------------------
diff --git a/Extras/BulletColladaConverter/CMakeLists.txt b/Extras/BulletColladaConverter/CMakeLists.txt
index f57bca05f..43c0abe74 100644
--- a/Extras/BulletColladaConverter/CMakeLists.txt
+++ b/Extras/BulletColladaConverter/CMakeLists.txt
@@ -10,3 +10,15 @@ ADD_LIBRARY(BulletColladaConverter
 IF (BUILD_SHARED_LIBS)
   TARGET_LINK_LIBRARIES(BulletColladaConverter ColladaDom BulletCollision BulletDynamics)
 ENDIF (BUILD_SHARED_LIBS)
+
+#INSTALL of other files requires CMake 2.6
+IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+	IF(INSTALL_EXTRA_LIBS)
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			INSTALL(TARGETS BulletColladaConverter DESTINATION .)
+		ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		INSTALL(TARGETS BulletColladaConverter DESTINATION lib)
+			INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (INSTALL_EXTRA_LIBS)
+ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
diff --git a/Extras/COLLADA_DOM/CMakeLists.txt b/Extras/COLLADA_DOM/CMakeLists.txt
index 4c0d40e57..92533d23e 100644
--- a/Extras/COLLADA_DOM/CMakeLists.txt
+++ b/Extras/COLLADA_DOM/CMakeLists.txt
@@ -211,3 +211,17 @@ ADD_LIBRARY(ColladaDom
 IF (BUILD_SHARED_LIBS)
   TARGET_LINK_LIBRARIES(ColladaDom XML)
 ENDIF (BUILD_SHARED_LIBS)
+
+#INSTALL of other files requires CMake 2.6
+IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+	IF(INSTALL_EXTRA_LIBS)
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			INSTALL(TARGETS ColladaDom DESTINATION .)
+		ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		INSTALL(TARGETS ColladaDom DESTINATION lib)
+			INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/1.4 DESTINATION include/1.4 FILES_MATCHING PATTERN "*.h")
+			INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/dae DESTINATION include/dae FILES_MATCHING PATTERN "*.h")
+			INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/modules DESTINATION include/modules FILES_MATCHING PATTERN "*.h")
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (INSTALL_EXTRA_LIBS)
+ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
diff --git a/Extras/LibXML/CMakeLists.txt b/Extras/LibXML/CMakeLists.txt
index 6d15034fa..efca5b7a0 100644
--- a/Extras/LibXML/CMakeLists.txt
+++ b/Extras/LibXML/CMakeLists.txt
@@ -55,3 +55,16 @@ ADD_LIBRARY(XML
 			xpath.c
 			xpointer.c
 )
+
+
+#INSTALL of other files requires CMake 2.6
+IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+	IF(INSTALL_EXTRA_LIBS)
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			INSTALL(TARGETS XML DESTINATION .)
+		ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		INSTALL(TARGETS XML DESTINATION lib)
+			INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/libxml DESTINATION include/libxml FILES_MATCHING PATTERN "*.h")
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (INSTALL_EXTRA_LIBS)
+ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
diff --git a/src/BulletMultiThreaded/CMakeLists.txt b/src/BulletMultiThreaded/CMakeLists.txt
index 31fbd0411..eb0623f47 100644
--- a/src/BulletMultiThreaded/CMakeLists.txt
+++ b/src/BulletMultiThreaded/CMakeLists.txt
@@ -69,3 +69,15 @@ ADD_LIBRARY(BulletMultiThreaded
 IF (BUILD_SHARED_LIBS)
 	TARGET_LINK_LIBRARIES(BulletMultiThreaded BulletCollision)
 ENDIF (BUILD_SHARED_LIBS)
+
+#INSTALL of other files requires CMake 2.6
+IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+	IF(INSTALL_EXTRA_LIBS)
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			INSTALL(TARGETS BulletMultiThreaded DESTINATION .)
+		ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+		INSTALL(TARGETS BulletMultiThreaded DESTINATION lib)
+			INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	ENDIF (INSTALL_EXTRA_LIBS)
+ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)