diff --git a/glm/glm.hpp b/glm/glm.hpp
index ea2f4678..729f8418 100644
--- a/glm/glm.hpp
+++ b/glm/glm.hpp
@@ -2,7 +2,7 @@
 // OpenGL Mathematics Copyright (c) 2005 - 2010 G-Truc Creation (www.g-truc.net)
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Created : 2005-01-14
-// Updated : 2010-05-30
+// Updated : 2011-01-19
 // Licence : This source is under MIT License
 // File    : glm/glm.hpp
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -30,14 +30,17 @@
 #ifndef glm_glm
 #define glm_glm
 
+//! Workaround for compatibility with other libraries
 #ifdef max
 #undef max
 #endif
 
+//! Workaround for compatibility with other libraries
 #ifdef min
 #undef min
 #endif
 
+//! TODO: to delete
 #define GLMvalType typename genType::value_type
 #define GLMcolType typename genType::col_type
 #define GLMrowType typename genType::row_type
@@ -48,6 +51,13 @@
 #include <limits>
 #include "./setup.hpp"
 
+#if(defined(GLM_MESSAGE) && (GLM_MESSAGE == GLM_ENABLE))
+#	ifndef GLM_MESSAGE_CORE_INCLUDED_DISPLAYED
+#		define GLM_MESSAGE_CORE_INCLUDED_DISPLAYED
+#		pragma message("GLM: Core library included")
+#	endif//GLM_MESSAGE_CORE_INCLUDED_DISPLAYED
+#endif//GLM_MESSAGE
+
 //! GLM namespace, it contains all GLSL based features.
 namespace glm
 {
@@ -101,10 +111,6 @@ namespace glm
 #include "./core/func_noise.hpp"
 #include "./core/_swizzle.hpp"
 
-#if(defined(GLM_MESSAGE) && (GLM_MESSAGE & (GLM_MESSAGE_CORE | GLM_MESSAGE_NOTIFICATION)))
-#	pragma message("GLM message: Core library included")
-#endif//GLM_MESSAGE
-
 #if(defined(GLM_COMPILER) && (GLM_COMPILER & GLM_COMPILER_VC))
 #	define GLM_DEPRECATED __declspec(deprecated)
 #	define GLM_RESTRICT __restrict
diff --git a/glm/setup.hpp b/glm/setup.hpp
index 27c494dd..483cea09 100644
--- a/glm/setup.hpp
+++ b/glm/setup.hpp
@@ -28,18 +28,18 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Message
 
-#define GLM_MESSAGE_QUIET			0x00000000
-
-#define GLM_MESSAGE_WARNING			0x00000001
-#define GLM_MESSAGE_NOTIFICATION	0x00000002
-#define GLM_MESSAGE_CORE			0x00000004
-#define GLM_MESSAGE_EXTS			0x00000008
-#define GLM_MESSAGE_SETUP			0x00000010
-
-#define GLM_MESSAGE_ALL				GLM_MESSAGE_WARNING | GLM_MESSAGE_NOTIFICATION | GLM_MESSAGE_CORE | GLM_MESSAGE_EXTS | GLM_MESSAGE_SETUP
+//#define GLM_MESSAGE_QUIET			0x00000000
+//
+//#define GLM_MESSAGE_WARNING			0x00000001
+//#define GLM_MESSAGE_NOTIFICATION	0x00000002
+//#define GLM_MESSAGE_CORE			0x00000004
+//#define GLM_MESSAGE_EXTS			0x00000008
+//#define GLM_MESSAGE_SETUP			0x00000010
+//
+//#define GLM_MESSAGE_ALL				GLM_MESSAGE_WARNING | GLM_MESSAGE_NOTIFICATION | GLM_MESSAGE_CORE | GLM_MESSAGE_EXTS | GLM_MESSAGE_SETUP
 
 //! By default:
-// #define GLM_MESSAGE				GLM_MESSAGE_QUIET
+// #define GLM_MESSAGE				GLM_DISABLE
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Precision
@@ -204,15 +204,15 @@
 /////////////////
 // C++ Version //
 
-#define GLM_CPP98 1
-#define GLM_CPP0X 2
+#define GLM_LANG_CPP98 1
+#define GLM_LANG_CPP0X 2
 
 #if((GLM_COMPILER & GLM_COMPILER_GCC) && defined(__GXX_EXPERIMENTAL_CXX0X__)) // -std=c++0x or -std=gnu++0x
-#	define GLM_CPP GLM_CPP0X
+#	define GLM_LANG GLM_LANG_CPP0X
 #elif GLM_COMPILER & GLM_COMPILER_VC2010
-#	define GLM_CPP GLM_CPP0X
+#	define GLM_LANG GLM_LANG_CPP0X
 #else
-#	define GLM_CPP GLM_CPP98
+#	define GLM_LANG GLM_LANG_CPP98
 #endif
 
 /////////////
@@ -393,7 +393,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Static assert
 
- #if(GLM_CPP == GLM_CPP0X)
+ #if(GLM_LANG == GLM_LANG_CPP0X)
 #	define GLM_STATIC_ASSERT(x, message) static_assert(x, message)
 #elif(defined(BOOST_STATIC_ASSERT))
 #	define GLM_STATIC_ASSERT(x, message) BOOST_STATIC_ASSERT(x)