diff --git a/glm/core/type_mat2x2.inl b/glm/core/type_mat2x2.inl
index f2d9c2b5d..1228478fb 100644
--- a/glm/core/type_mat2x2.inl
+++ b/glm/core/type_mat2x2.inl
@@ -32,7 +32,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
@@ -43,7 +43,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_mat2x3.inl b/glm/core/type_mat2x3.inl
index 16cd1eaff..94f439059 100644
--- a/glm/core/type_mat2x3.inl
+++ b/glm/core/type_mat2x3.inl
@@ -32,7 +32,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
@@ -43,7 +43,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_mat2x4.inl b/glm/core/type_mat2x4.inl
index 2ae0b06f3..9da29a7f2 100644
--- a/glm/core/type_mat2x4.inl
+++ b/glm/core/type_mat2x4.inl
@@ -32,7 +32,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
@@ -43,7 +43,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_mat3x2.inl b/glm/core/type_mat3x2.inl
index cbdc2821d..24def0b26 100644
--- a/glm/core/type_mat3x2.inl
+++ b/glm/core/type_mat3x2.inl
@@ -32,7 +32,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
@@ -43,7 +43,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_mat3x3.inl b/glm/core/type_mat3x3.inl
index 5ca1b2ed4..587370548 100644
--- a/glm/core/type_mat3x3.inl
+++ b/glm/core/type_mat3x3.inl
@@ -32,7 +32,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
@@ -43,7 +43,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_mat3x4.inl b/glm/core/type_mat3x4.inl
index 039635000..5bb9158f1 100644
--- a/glm/core/type_mat3x4.inl
+++ b/glm/core/type_mat3x4.inl
@@ -32,7 +32,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
@@ -43,7 +43,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_mat4x2.inl b/glm/core/type_mat4x2.inl
index c71074363..48117f28f 100644
--- a/glm/core/type_mat4x2.inl
+++ b/glm/core/type_mat4x2.inl
@@ -32,7 +32,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
@@ -43,7 +43,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_mat4x3.inl b/glm/core/type_mat4x3.inl
index f9324e7c7..0ba1f17c7 100644
--- a/glm/core/type_mat4x3.inl
+++ b/glm/core/type_mat4x3.inl
@@ -32,7 +32,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
@@ -43,7 +43,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_mat4x4.inl b/glm/core/type_mat4x4.inl
index f96f782cd..0152e4b41 100644
--- a/glm/core/type_mat4x4.inl
+++ b/glm/core/type_mat4x4.inl
@@ -32,7 +32,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
@@ -43,7 +43,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i >= size_type(0) && i < col_size());
+		assert(i < col_size());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_vec1.inl b/glm/core/type_vec1.inl
index 8b27c3e8c..47c586a2c 100644
--- a/glm/core/type_vec1.inl
+++ b/glm/core/type_vec1.inl
@@ -26,7 +26,7 @@ namespace glm
 			size_type i
 		)
 		{
-			assert(i >= size_type(0) && i < value_size());
+			assert(i < value_size());
 			return (&x)[i];
 		}
 
@@ -36,7 +36,7 @@ namespace glm
 			size_type i
 		) const
 		{
-			assert(i >= size_type(0) && i < value_size());
+			assert(i < value_size());
 			return (&x)[i];
 		}
 
diff --git a/glm/core/type_vec2.inl b/glm/core/type_vec2.inl
index 4bd5a69b0..4620b6876 100644
--- a/glm/core/type_vec2.inl
+++ b/glm/core/type_vec2.inl
@@ -27,7 +27,7 @@ namespace glm
 			size_type i
 		)
 		{
-			assert(i >= size_type(0) && i < value_size());
+			assert(i < value_size());
 			return (&x)[i];
 		}
 
@@ -38,7 +38,7 @@ namespace glm
 			size_type i
 		) const
 		{
-			assert(i >= size_type(0) && i < value_size());
+			assert(i < value_size());
 			return (&x)[i];
 		}
 
diff --git a/glm/core/type_vec3.inl b/glm/core/type_vec3.inl
index e652fa28d..d2b1ae294 100644
--- a/glm/core/type_vec3.inl
+++ b/glm/core/type_vec3.inl
@@ -27,7 +27,7 @@ namespace glm
 			size_type i
 		)
 		{
-			assert(i >= size_type(0) && i < value_size());
+			assert(i < value_size());
 			return (&x)[i];
 		}
 
@@ -38,7 +38,7 @@ namespace glm
 			size_type i
 		) const
 		{
-			assert(i >= size_type(0) && i < value_size());
+			assert(i < value_size());
 			return (&x)[i];
 		}
 
diff --git a/glm/core/type_vec4.inl b/glm/core/type_vec4.inl
index 1bcf20cae..cb2ff4cc1 100644
--- a/glm/core/type_vec4.inl
+++ b/glm/core/type_vec4.inl
@@ -27,7 +27,7 @@ namespace glm
 			size_type i
 		)
 		{
-			assert(i >= size_type(0) && i < value_size());
+			assert(i < value_size());
 			return (&x)[i];
 		}
 
@@ -38,7 +38,7 @@ namespace glm
 			size_type i
 		) const
 		{
-			assert(i >= size_type(0) && i < value_size());
+			assert(i < value_size());
 			return (&x)[i];
 		}
 
diff --git a/glm/gtc/swizzle.hpp b/glm/gtc/swizzle.hpp
index eb354080d..e71210eb5 100644
--- a/glm/gtc/swizzle.hpp
+++ b/glm/gtc/swizzle.hpp
@@ -11,7 +11,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifndef glm_gtc_swizzle
-#define glm_gtc_closest_point
+#define glm_gtc_swizzle
 
 // Dependency:
 #include "../glm.hpp"
@@ -26,7 +26,25 @@ namespace glm
 	//! GLM_GTC_swizzle extension
 	namespace swizzle{
 
+		template <typename T>
+		T swizzle(	
+			detail::tvec4<T> const & v,
+			comp x);
 
+		template <typename T>
+		detail::tvec2<T> swizzle(
+			detail::tvec4<T> const & v,
+			comp x, comp y);
+
+		template <typename T>
+		detail::tvec3<T> swizzle(
+			detail::tvec4<T> const & v,
+			comp x, comp y, comp z);
+
+		template <typename T>
+		inline detail::tref4<T> swizzle(
+			detail::tvec4<T> const & v,
+			comp x, comp y, comp z, comp w);
 
 	}//namespace swizzle
 	}//namespace gtc