diff --git a/glm/detail/_noise.hpp b/glm/detail/_noise.hpp
index 8e3a51e5..9b36db69 100644
--- a/glm/detail/_noise.hpp
+++ b/glm/detail/_noise.hpp
@@ -11,93 +11,93 @@
 namespace glm{
 namespace detail
 {
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T mod289(T const & x)
 	{
 		return x - floor(x * (static_cast<T>(1.0) / static_cast<T>(289.0))) * static_cast<T>(289.0);
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T permute(T const & x)
 	{
 		return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> permute(vec<2, T, P> const & x)
 	{
 		return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
 	}
 	
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> permute(vec<3, T, P> const & x)
 	{
 		return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
 	}
 	
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> permute(vec<4, T, P> const & x)
 	{
 		return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
 	}
 /*
-	template <typename T, precision P, template<typename> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> permute(vecType<D, T, P> const & x)
+	template<typename T, precision P, template<typename> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> permute(vecType<L, T, P> const & x)
 	{
 		return mod289(((x * T(34)) + T(1)) * x);
 	}
 */
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T taylorInvSqrt(T const & r)
 	{
 		return T(1.79284291400159) - T(0.85373472095314) * r;
 	}
 	
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> taylorInvSqrt(vec<2, T, P> const & r)
 	{
 		return T(1.79284291400159) - T(0.85373472095314) * r;
 	}
 	
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> taylorInvSqrt(vec<3, T, P> const & r)
 	{
 		return T(1.79284291400159) - T(0.85373472095314) * r;
 	}
 	
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> taylorInvSqrt(vec<4, T, P> const & r)
 	{
 		return T(1.79284291400159) - T(0.85373472095314) * r;
 	}
 /*
-	template <typename T, precision P, template<typename> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> taylorInvSqrt(vecType<D, T, P> const & r)
+	template<typename T, precision P, template<typename> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> taylorInvSqrt(vecType<L, T, P> const & r)
 	{
 		return T(1.79284291400159) - T(0.85373472095314) * r;
 	}
 */
 	
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> fade(vec<2, T, P> const & t)
 	{
 		return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
 	}
 	
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> fade(vec<3, T, P> const & t)
 	{
 		return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
 	}
 	
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> fade(vec<4, T, P> const & t)
 	{
 		return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
 	}
 /*
-	template <typename T, precision P, template <typename> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fade(vecType<D, T, P> const & t)
+	template<typename T, precision P, template<typename> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fade(vecType<L, T, P> const & t)
 	{
 		return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
 	}
diff --git a/glm/detail/_swizzle.hpp b/glm/detail/_swizzle.hpp
index 5e8b0d0b..f404f5da 100644
--- a/glm/detail/_swizzle.hpp
+++ b/glm/detail/_swizzle.hpp
@@ -7,7 +7,7 @@ namespace glm{
 namespace detail
 {
 	// Internal class for implementing swizzle operators
-	template <typename T, int N>
+	template<typename T, int N>
 	struct _swizzle_base0
 	{
 	protected:
@@ -20,24 +20,24 @@ namespace detail
 		char    _buffer[1];
 	};
 
-	template <int N, typename T, precision P, int E0, int E1, int E2, int E3, bool Aligned>
+	template<int N, typename T, precision P, int E0, int E1, int E2, int E3, bool Aligned>
 	struct _swizzle_base1 : public _swizzle_base0<T, N>
 	{
 	};
 
-	template <typename T, precision P, int E0, int E1, bool Aligned>
+	template<typename T, precision P, int E0, int E1, bool Aligned>
 	struct _swizzle_base1<2, T, P, E0,E1,-1,-2, Aligned> : public _swizzle_base0<T, 2>
 	{
 		GLM_FUNC_QUALIFIER vec<2, T, P> operator ()()  const { return vec<2, T, P>(this->elem(E0), this->elem(E1)); }
 	};
 
-	template <typename T, precision P, int E0, int E1, int E2, bool Aligned>
+	template<typename T, precision P, int E0, int E1, int E2, bool Aligned>
 	struct _swizzle_base1<3, T, P, E0,E1,E2,-1, Aligned> : public _swizzle_base0<T, 3>
 	{
 		GLM_FUNC_QUALIFIER vec<3, T, P> operator ()()  const { return vec<3, T, P>(this->elem(E0), this->elem(E1), this->elem(E2)); }
 	};
 
-	template <typename T, precision P, int E0, int E1, int E2, int E3, bool Aligned>
+	template<typename T, precision P, int E0, int E1, int E2, int E3, bool Aligned>
 	struct _swizzle_base1<4, T, P, E0,E1,E2,E3, Aligned> : public _swizzle_base0<T, 4>
 	{ 
 		GLM_FUNC_QUALIFIER vec<4, T, P> operator ()()  const { return vec<4, T, P>(this->elem(E0), this->elem(E1), this->elem(E2), this->elem(E3)); }
@@ -55,7 +55,7 @@ namespace detail
 		DUPLICATE_ELEMENTS = 1 if there is a repeated element, 0 otherwise (used to specialize swizzles
 			containing duplicate elements so that they cannot be used as r-values).            
 	*/
-	template <int N, typename T, precision P, int E0, int E1, int E2, int E3, int DUPLICATE_ELEMENTS>
+	template<int N, typename T, precision P, int E0, int E1, int E2, int E3, int DUPLICATE_ELEMENTS>
 	struct _swizzle_base2 : public _swizzle_base1<N, T, P, E0,E1,E2,E3, detail::is_aligned<P>::value>
 	{
 		GLM_FUNC_QUALIFIER _swizzle_base2& operator= (const T& t)
@@ -118,7 +118,7 @@ namespace detail
 		}
 
 	protected:
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_QUALIFIER void _apply_op(vec<N, T, P> const& that, U op)
 		{
 			// Make a copy of the data in this == &that.
@@ -133,7 +133,7 @@ namespace detail
 	};
 
 	// Specialization for swizzles containing duplicate elements.  These cannot be modified.
-	template <int N, typename T, precision P, int E0, int E1, int E2, int E3>
+	template<int N, typename T, precision P, int E0, int E1, int E2, int E3>
 	struct _swizzle_base2<N, T, P, E0,E1,E2,E3, 1> : public _swizzle_base1<N, T, P, E0,E1,E2,E3, detail::is_aligned<P>::value>
 	{
 		struct Stub {};
@@ -147,7 +147,7 @@ namespace detail
 		}
 	};
 
-	template <int N, typename T, precision P, int E0, int E1, int E2, int E3>
+	template<int N, typename T, precision P, int E0, int E1, int E2, int E3>
 	struct _swizzle : public _swizzle_base2<N, T, P, E0, E1, E2, E3, (E0 == E1 || E0 == E2 || E0 == E3 || E1 == E2 || E1 == E3 || E2 == E3)>
 	{
 		typedef _swizzle_base2<N, T, P, E0, E1, E2, E3, (E0 == E1 || E0 == E2 || E0 == E3 || E1 == E2 || E1 == E3 || E2 == E3)> base_type;
@@ -160,8 +160,8 @@ namespace detail
 //
 // To prevent the C++ syntax from getting entirely overwhelming, define some alias macros
 //
-#define _GLM_SWIZZLE_TEMPLATE1   template <int N, typename T, precision P, int E0, int E1, int E2, int E3>
-#define _GLM_SWIZZLE_TEMPLATE2   template <int N, typename T, precision P, int E0, int E1, int E2, int E3, int F0, int F1, int F2, int F3>
+#define _GLM_SWIZZLE_TEMPLATE1   template<int N, typename T, precision P, int E0, int E1, int E2, int E3>
+#define _GLM_SWIZZLE_TEMPLATE2   template<int N, typename T, precision P, int E0, int E1, int E2, int E3, int F0, int F1, int F2, int F3>
 #define _GLM_SWIZZLE_TYPE1       _swizzle<N, T, P, E0, E1, E2, E3>
 #define _GLM_SWIZZLE_TYPE2       _swizzle<N, T, P, F0, F1, F2, F3>
 
diff --git a/glm/detail/_swizzle_func.hpp b/glm/detail/_swizzle_func.hpp
index 06103621..0ca9bd8e 100644
--- a/glm/detail/_swizzle_func.hpp
+++ b/glm/detail/_swizzle_func.hpp
@@ -22,21 +22,21 @@
 	}
 
 #define GLM_SWIZZLE_GEN_VEC2_ENTRY_DEF(T, P, L, CONST, A, B)	\
-	template <typename T>										\
+	template<typename T>										\
 	vec<L, T, P> vec<L, T, P>::A ## B() CONST					\
 	{															\
 		return vec<2, T, P>(this->A, this->B);					\
 	}
 
 #define GLM_SWIZZLE_GEN_VEC3_ENTRY_DEF(T, P, L, CONST, A, B, C)		\
-	template <typename T>											\
+	template<typename T>											\
 	vec<3, T, P> vec<L, T, P>::A ## B ## C() CONST					\
 	{																\
 		return vec<3, T, P>(this->A, this->B, this->C);				\
 	}
 
 #define GLM_SWIZZLE_GEN_VEC4_ENTRY_DEF(T, P, L, CONST, A, B, C, D)		\
-	template <typename T>												\
+	template<typename T>												\
 	vec<4, T, P> vec<L, T, P>::A ## B ## C ## D() CONST					\
 	{																	\
 		return vec<4, T, P>(this->A, this->B, this->C, this->D);		\
diff --git a/glm/detail/_vectorize.hpp b/glm/detail/_vectorize.hpp
index 8e77a05e..44fb0b5d 100644
--- a/glm/detail/_vectorize.hpp
+++ b/glm/detail/_vectorize.hpp
@@ -11,10 +11,10 @@
 namespace glm{
 namespace detail
 {
-	template <int D, typename R, typename T, precision P>
+	template<length_t L, typename R, typename T, precision P>
 	struct functor1{};
 
-	template <typename R, typename T, precision P>
+	template<typename R, typename T, precision P>
 	struct functor1<1, R, T, P>
 	{
 		GLM_FUNC_QUALIFIER static vec<1, R, P> call(R (*Func) (T x), vec<1, T, P> const & v)
@@ -23,7 +23,7 @@ namespace detail
 		}
 	};
 
-	template <typename R, typename T, precision P>
+	template<typename R, typename T, precision P>
 	struct functor1<2, R, T, P>
 	{
 		GLM_FUNC_QUALIFIER static vec<2, R, P> call(R (*Func) (T x), vec<2, T, P> const & v)
@@ -32,7 +32,7 @@ namespace detail
 		}
 	};
 
-	template <typename R, typename T, precision P>
+	template<typename R, typename T, precision P>
 	struct functor1<3, R, T, P>
 	{
 		GLM_FUNC_QUALIFIER static vec<3, R, P> call(R (*Func) (T x), vec<3, T, P> const & v)
@@ -41,7 +41,7 @@ namespace detail
 		}
 	};
 
-	template <typename R, typename T, precision P>
+	template<typename R, typename T, precision P>
 	struct functor1<4, R, T, P>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, R, P> call(R (*Func) (T x), vec<4, T, P> const & v)
@@ -50,10 +50,10 @@ namespace detail
 		}
 	};
 
-	template <int D, typename T, precision P>
+	template<length_t L, typename T, precision P>
 	struct functor2{};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct functor2<1, T, P>
 	{
 		GLM_FUNC_QUALIFIER static vec<1, T, P> call(T (*Func) (T x, T y), vec<1, T, P> const & a, vec<1, T, P> const & b)
@@ -62,7 +62,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct functor2<2, T, P>
 	{
 		GLM_FUNC_QUALIFIER static vec<2, T, P> call(T (*Func) (T x, T y), vec<2, T, P> const & a, vec<2, T, P> const & b)
@@ -71,7 +71,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct functor2<3, T, P>
 	{
 		GLM_FUNC_QUALIFIER static vec<3, T, P> call(T (*Func) (T x, T y), vec<3, T, P> const & a, vec<3, T, P> const & b)
@@ -80,7 +80,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct functor2<4, T, P>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, T, P> call(T (*Func) (T x, T y), vec<4, T, P> const & a, vec<4, T, P> const & b)
@@ -89,10 +89,10 @@ namespace detail
 		}
 	};
 
-	template <int D, typename T, precision P>
+	template<length_t L, typename T, precision P>
 	struct functor2_vec_sca{};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct functor2_vec_sca<1, T, P>
 	{
 		GLM_FUNC_QUALIFIER static vec<1, T, P> call(T (*Func) (T x, T y), vec<1, T, P> const & a, T b)
@@ -101,7 +101,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct functor2_vec_sca<2, T, P>
 	{
 		GLM_FUNC_QUALIFIER static vec<2, T, P> call(T (*Func) (T x, T y), vec<2, T, P> const & a, T b)
@@ -110,7 +110,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct functor2_vec_sca<3, T, P>
 	{
 		GLM_FUNC_QUALIFIER static vec<3, T, P> call(T (*Func) (T x, T y), vec<3, T, P> const & a, T b)
@@ -119,7 +119,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct functor2_vec_sca<4, T, P>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, T, P> call(T (*Func) (T x, T y), vec<4, T, P> const & a, T b)
diff --git a/glm/detail/dummy.cpp b/glm/detail/dummy.cpp
index bf037c08..fb1daf38 100644
--- a/glm/detail/dummy.cpp
+++ b/glm/detail/dummy.cpp
@@ -166,21 +166,21 @@ glm::vec3 lighting
 */
 
 /*
-template <typename T, glm::precision P, template<typename, glm::precision> class vecType>
-T normalizeDotA(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+template<typename T, glm::precision P, template<typename, glm::precision> class vecType>
+T normalizeDotA(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 {
 	return glm::dot(x, y) * glm::inversesqrt(glm::dot(x, x) * glm::dot(y, y));
 }
 
 #define GLM_TEMPLATE_GENTYPE typename T, glm::precision P, template<typename, glm::precision> class
 
-template <GLM_TEMPLATE_GENTYPE vecType>
-T normalizeDotB(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+template<GLM_TEMPLATE_GENTYPE vecType>
+T normalizeDotB(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 {
 	return glm::dot(x, y) * glm::inversesqrt(glm::dot(x, x) * glm::dot(y, y));
 }
 
-template <typename vecType>
+template<typename vecType>
 typename vecType::value_type normalizeDotC(vecType const & a, vecType const & b)
 {
 	return glm::dot(a, b) * glm::inversesqrt(glm::dot(a, a) * glm::dot(b, b));
diff --git a/glm/detail/func_common.hpp b/glm/detail/func_common.hpp
index 190b0cad..97326ca2 100644
--- a/glm/detail/func_common.hpp
+++ b/glm/detail/func_common.hpp
@@ -26,11 +26,11 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/abs.xml">GLSL abs man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType abs(genType x);
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> abs(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> abs(vecType<L, T, P> const & x);
 
 	/// Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0. 
 	/// 
@@ -38,8 +38,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sign.xml">GLSL sign man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> sign(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> sign(vecType<L, T, P> const & x);
 
 	/// Returns a value equal to the nearest integer that is less then or equal to x. 
 	/// 
@@ -47,8 +47,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floor.xml">GLSL floor man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> floor(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> floor(vecType<L, T, P> const & x);
 
 	/// Returns a value equal to the nearest integer to x
 	/// whose absolute value is not larger than the absolute value of x.
@@ -57,8 +57,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/trunc.xml">GLSL trunc man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> trunc(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> trunc(vecType<L, T, P> const & x);
 
 	/// Returns a value equal to the nearest integer to x.
 	/// The fraction 0.5 will round in a direction chosen by the
@@ -70,8 +70,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/round.xml">GLSL round man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> round(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> round(vecType<L, T, P> const & x);
 
 	/// Returns a value equal to the nearest integer to x.
 	/// A fractional part of 0.5 will round toward the nearest even
@@ -82,8 +82,8 @@ namespace glm
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/roundEven.xml">GLSL roundEven man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
 	/// @see <a href="http://developer.amd.com/documentation/articles/pages/New-Round-to-Even-Technique.aspx">New round to even technique</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> roundEven(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> roundEven(vecType<L, T, P> const & x);
 
 	/// Returns a value equal to the nearest integer
 	/// that is greater than or equal to x.
@@ -92,8 +92,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/ceil.xml">GLSL ceil man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> ceil(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> ceil(vecType<L, T, P> const & x);
 
 	/// Return x - floor(x).
 	/// 
@@ -101,11 +101,11 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/fract.xml">GLSL fract man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType fract(genType x);
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> fract(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> fract(vecType<L, T, P> const & x);
 
 	/// Modulus. Returns x - y * floor(x / y)
 	/// for each component in x using the floating point value y.
@@ -114,14 +114,14 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType mod(genType x, genType y);
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> mod(vecType<D, T, P> const & x, T y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> mod(vecType<L, T, P> const & x, T y);
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> mod(vecType<D, T, P> const & x, vecType<D, T, P> const & y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> mod(vecType<L, T, P> const & x, vecType<L, T, P> const & y);
 
 	/// Returns the fractional part of x and sets i to the integer
 	/// part (as a whole number floating point value). Both the
@@ -132,7 +132,7 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/modf.xml">GLSL modf man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType modf(genType x, genType & i);
 
 	/// Returns y if y < x; otherwise, it returns x.
@@ -141,14 +141,14 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/min.xml">GLSL min man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType min(genType x, genType y);
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> min(vecType<D, T, P> const & x, T y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> min(vecType<L, T, P> const & x, T y);
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> min(vecType<D, T, P> const & x, vecType<D, T, P> const & y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> min(vecType<L, T, P> const & x, vecType<L, T, P> const & y);
 
 	/// Returns y if x < y; otherwise, it returns x.
 	/// 
@@ -156,14 +156,14 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/max.xml">GLSL max man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType max(genType x, genType y);
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> max(vecType<D, T, P> const & x, T y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> max(vecType<L, T, P> const & x, T y);
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> max(vecType<D, T, P> const & x, vecType<D, T, P> const & y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> max(vecType<L, T, P> const & x, vecType<L, T, P> const & y);
 
 	/// Returns min(max(x, minVal), maxVal) for each component in x 
 	/// using the floating-point values minVal and maxVal.
@@ -172,14 +172,14 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/clamp.xml">GLSL clamp man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType clamp(genType x, genType minVal, genType maxVal);
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> clamp(vecType<D, T, P> const & x, T minVal, T maxVal);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> clamp(vecType<L, T, P> const & x, T minVal, T maxVal);
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> clamp(vecType<D, T, P> const & x, vecType<D, T, P> const & minVal, vecType<D, T, P> const & maxVal);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> clamp(vecType<L, T, P> const & x, vecType<L, T, P> const & minVal, vecType<L, T, P> const & maxVal);
 
 	/// If genTypeU is a floating scalar or vector:
 	/// Returns x * (1.0 - a) + y * a, i.e., the linear blend of
@@ -223,35 +223,35 @@ namespace glm
 	/// glm::dvec3 t = glm::mix(e, f, a); // Types of the third parameter is not required to match with the first and the second.
 	/// glm::vec4 u = glm::mix(g, h, r); // Interpolations can be perform per component with a vector for the last parameter.
 	/// @endcode
-	template <int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> mix(vecType<D, T, P> const & x, vecType<D, T, P> const & y, vecType<D, U, P> const & a);
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> mix(vecType<L, T, P> const & x, vecType<L, T, P> const & y, vecType<L, U, P> const & a);
 
-	template <int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> mix(vecType<D, T, P> const & x, vecType<D, T, P> const & y, U a);
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> mix(vecType<L, T, P> const & x, vecType<L, T, P> const & y, U a);
 
-	template <typename genTypeT, typename genTypeU>
+	template<typename genTypeT, typename genTypeU>
 	GLM_FUNC_DECL genTypeT mix(genTypeT x, genTypeT y, genTypeU a);
 
 	/// Returns 0.0 if x < edge, otherwise it returns 1.0 for each component of a genType.
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/step.xml">GLSL step man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType step(genType edge, genType x);
 
 	/// Returns 0.0 if x < edge, otherwise it returns 1.0.
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/step.xml">GLSL step man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <template <int, typename, precision> class vecType, int D, typename T, precision P>
-	GLM_FUNC_DECL vecType<D, T, P> step(T edge, vecType<D, T, P> const & x);
+	template<template<length_t, typename, precision> class vecType, length_t L, typename T, precision P>
+	GLM_FUNC_DECL vecType<L, T, P> step(T edge, vecType<L, T, P> const & x);
 
 	/// Returns 0.0 if x < edge, otherwise it returns 1.0.
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/step.xml">GLSL step man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <template <int, typename, precision> class vecType, int D, typename T, precision P>
-	GLM_FUNC_DECL vecType<D, T, P> step(vecType<D, T, P> const & edge, vecType<D, T, P> const & x);
+	template<template<length_t, typename, precision> class vecType, length_t L, typename T, precision P>
+	GLM_FUNC_DECL vecType<L, T, P> step(vecType<L, T, P> const & edge, vecType<L, T, P> const & x);
 
 	/// Returns 0.0 if x <= edge0 and 1.0 if x >= edge1 and
 	/// performs smooth Hermite interpolation between 0 and 1
@@ -267,14 +267,14 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/smoothstep.xml">GLSL smoothstep man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType smoothstep(genType edge0, genType edge1, genType x);
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> smoothstep(T edge0, T edge1, vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> smoothstep(T edge0, T edge1, vecType<L, T, P> const & x);
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> smoothstep(vecType<D, T, P> const & edge0, vecType<D, T, P> const & edge1, vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> smoothstep(vecType<L, T, P> const & edge0, vecType<L, T, P> const & edge1, vecType<L, T, P> const & x);
 
 	/// Returns true if x holds a NaN (not a number)
 	/// representation in the underlying implementation's set of
@@ -288,8 +288,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/isnan.xml">GLSL isnan man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, bool, P> isnan(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, bool, P> isnan(vecType<L, T, P> const & x);
 
 	/// Returns true if x holds a positive infinity or negative
 	/// infinity representation in the underlying implementation's
@@ -301,8 +301,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/isinf.xml">GLSL isinf man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, bool, P> isinf(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, bool, P> isinf(vecType<L, T, P> const & x);
 
 	/// Returns a signed integer value representing
 	/// the encoding of a floating-point value. The floating-point
@@ -318,8 +318,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floatBitsToInt.xml">GLSL floatBitsToInt man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <template <int, typename, precision> class vecType, int D, precision P>
-	GLM_FUNC_DECL vecType<D, int, P> floatBitsToInt(vecType<D, float, P> const & v);
+	template<template<length_t, typename, precision> class vecType, length_t L, precision P>
+	GLM_FUNC_DECL vecType<L, int, P> floatBitsToInt(vecType<L, float, P> const & v);
 
 	/// Returns a unsigned integer value representing
 	/// the encoding of a floating-point value. The floatingpoint
@@ -335,8 +335,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floatBitsToUint.xml">GLSL floatBitsToUint man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <template <int, typename, precision> class vecType, int D, precision P>
-	GLM_FUNC_DECL vecType<D, uint, P> floatBitsToUint(vecType<D, float, P> const & v);
+	template<template<length_t, typename, precision> class vecType, length_t L, precision P>
+	GLM_FUNC_DECL vecType<L, uint, P> floatBitsToUint(vecType<L, float, P> const & v);
 
 	/// Returns a floating-point value corresponding to a signed
 	/// integer encoding of a floating-point value.
@@ -356,8 +356,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/intBitsToFloat.xml">GLSL intBitsToFloat man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <template <int, typename, precision> class vecType, int D, precision P>
-	GLM_FUNC_DECL vecType<D, float, P> intBitsToFloat(vecType<D, int, P> const & v);
+	template<template<length_t, typename, precision> class vecType, length_t L, precision P>
+	GLM_FUNC_DECL vecType<L, float, P> intBitsToFloat(vecType<L, int, P> const & v);
 
 	/// Returns a floating-point value corresponding to a
 	/// unsigned integer encoding of a floating-point value.
@@ -377,8 +377,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/uintBitsToFloat.xml">GLSL uintBitsToFloat man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <template <int, typename, precision> class vecType, int D, precision P>
-	GLM_FUNC_DECL vecType<D, float, P> uintBitsToFloat(vecType<D, uint, P> const & v);
+	template<template<length_t, typename, precision> class vecType, length_t L, precision P>
+	GLM_FUNC_DECL vecType<L, float, P> uintBitsToFloat(vecType<L, uint, P> const & v);
 
 	/// Computes and returns a * b + c.
 	/// 
@@ -386,7 +386,7 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/fma.xml">GLSL fma man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType fma(genType const & a, genType const & b, genType const & c);
 
 	/// Splits x into a floating-point significand in the range
@@ -403,7 +403,7 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/frexp.xml">GLSL frexp man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <typename genType, typename genIType>
+	template<typename genType, typename genIType>
 	GLM_FUNC_DECL genType frexp(genType const & x, genIType & exp);
 
 	/// Builds a floating-point number from x and the
@@ -417,7 +417,7 @@ namespace glm
 	///  
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/ldexp.xml">GLSL ldexp man page</a>; 
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <typename genType, typename genIType>
+	template<typename genType, typename genIType>
 	GLM_FUNC_DECL genType ldexp(genType const & x, genIType const & exp);
 
 	/// @}
diff --git a/glm/detail/func_common.inl b/glm/detail/func_common.inl
index 08470abd..cafaed59 100644
--- a/glm/detail/func_common.inl
+++ b/glm/detail/func_common.inl
@@ -11,7 +11,7 @@
 namespace glm
 {
 	// min
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType min(genType x, genType y)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559 || std::numeric_limits<genType>::is_integer || GLM_UNRESTRICTED_GENTYPE, "'min' only accept floating-point or integer inputs");
@@ -19,7 +19,7 @@ namespace glm
 	}
 
 	// max
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType max(genType x, genType y)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559 || std::numeric_limits<genType>::is_integer || GLM_UNRESTRICTED_GENTYPE, "'max' only accept floating-point or integer inputs");
@@ -28,7 +28,7 @@ namespace glm
 	}
 
 	// abs
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER int32 abs(int32 x)
 	{
 		int32 const y = x >> 31;
@@ -39,7 +39,7 @@ namespace glm
 #	if GLM_HAS_CXX11_STL
 		using ::std::round;
 #	else
-		template <typename genType>
+		template<typename genType>
 		GLM_FUNC_QUALIFIER genType round(genType x)
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'round' only accept floating-point inputs");
@@ -52,7 +52,7 @@ namespace glm
 #	if GLM_HAS_CXX11_STL
 		using ::std::trunc;
 #	else
-		template <typename genType>
+		template<typename genType>
 		GLM_FUNC_QUALIFIER genType trunc(genType x)
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'trunc' only accept floating-point inputs");
@@ -66,11 +66,11 @@ namespace glm
 namespace glm{
 namespace detail
 {
-	template <typename genFIType, bool /*signed*/>
+	template<typename genFIType, bool /*signed*/>
 	struct compute_abs
 	{};
 
-	template <typename genFIType>
+	template<typename genFIType>
 	struct compute_abs<genFIType, true>
 	{
 		GLM_FUNC_QUALIFIER static genFIType call(genFIType x)
@@ -85,7 +85,7 @@ namespace detail
 	};
 
 	#if GLM_COMPILER & GLM_COMPILER_CUDA
-	template <>
+	template<>
 	struct compute_abs<float, true>
 	{
 		GLM_FUNC_QUALIFIER static float call(float x)
@@ -95,7 +95,7 @@ namespace detail
 	};
 	#endif
 
-	template <typename genFIType>
+	template<typename genFIType>
 	struct compute_abs<genFIType, false>
 	{
 		GLM_FUNC_QUALIFIER static genFIType call(genFIType x)
@@ -107,59 +107,59 @@ namespace detail
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_abs_vector
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x)
 		{
-			return detail::functor1<D, T, T, P>::call(abs, x);
+			return detail::functor1<L, T, T, P>::call(abs, x);
 		}
 	};
 
-	template <int D, typename T, typename U, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_mix_vector
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x, vecType<D, T, P> const & y, vecType<D, U, P> const & a)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x, vecType<L, T, P> const & y, vecType<L, U, P> const & a)
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<U>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'mix' only accept floating-point inputs for the interpolator a");
 
-			return vecType<D, T, P>(vecType<D, U, P>(x) + a * vecType<D, U, P>(y - x));
+			return vecType<L, T, P>(vecType<L, U, P>(x) + a * vecType<L, U, P>(y - x));
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
-	struct compute_mix_vector<D, T, bool, P, vecType, Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
+	struct compute_mix_vector<L, T, bool, P, vecType, Aligned>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x, vecType<D, T, P> const & y, vecType<D, bool, P> const & a)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x, vecType<L, T, P> const & y, vecType<L, bool, P> const & a)
 		{
-			vecType<D, T, P> Result(uninitialize);
+			vecType<L, T, P> Result(uninitialize);
 			for(length_t i = 0; i < x.length(); ++i)
 				Result[i] = a[i] ? y[i] : x[i];
 			return Result;
 		}
 	};
 
-	template <int D, typename T, typename U, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_mix_scalar
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x, vecType<D, T, P> const & y, U const & a)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x, vecType<L, T, P> const & y, U const & a)
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<U>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'mix' only accept floating-point inputs for the interpolator a");
 
-			return vecType<D, T, P>(vecType<D, U, P>(x) + a * vecType<D, U, P>(y - x));
+			return vecType<L, T, P>(vecType<L, U, P>(x) + a * vecType<L, U, P>(y - x));
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
-	struct compute_mix_scalar<D, T, bool, P, vecType, Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
+	struct compute_mix_scalar<L, T, bool, P, vecType, Aligned>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x, vecType<D, T, P> const & y, bool const & a)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x, vecType<L, T, P> const & y, bool const & a)
 		{
 			return a ? y : x;
 		}
 	};
 
-	template <typename T, typename U>
+	template<typename T, typename U>
 	struct compute_mix
 	{
 		GLM_FUNC_QUALIFIER static T call(T const & x, T const & y, U const & a)
@@ -170,7 +170,7 @@ namespace detail
 		}
 	};
 
-	template <typename T>
+	template<typename T>
 	struct compute_mix<T, bool>
 	{
 		GLM_FUNC_QUALIFIER static T call(T const & x, T const & y, bool const & a)
@@ -179,147 +179,147 @@ namespace detail
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool isFloat, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool isFloat, bool Aligned>
 	struct compute_sign
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x)
 		{
-			return vecType<D, T, P>(glm::lessThan(vecType<D, T, P>(0), x)) - vecType<D, T, P>(glm::lessThan(x, vecType<D, T, P>(0)));
+			return vecType<L, T, P>(glm::lessThan(vecType<L, T, P>(0), x)) - vecType<L, T, P>(glm::lessThan(x, vecType<L, T, P>(0)));
 		}
 	};
 
 #	if GLM_ARCH == GLM_ARCH_X86
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_sign<T, P, vecType, false, Aligned>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x)
 		{
 			T const Shift(static_cast<T>(sizeof(T) * 8 - 1));
-			vecType<D, T, P> const y(vecType<typename make_unsigned<T>::type, P>(-x) >> typename make_unsigned<T>::type(Shift));
+			vecType<L, T, P> const y(vecType<typename make_unsigned<T>::type, P>(-x) >> typename make_unsigned<T>::type(Shift));
 
 			return (x >> Shift) | y;
 		}
 	};
 #	endif
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_floor
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x)
 		{
-			return detail::functor1<D, T, T, P>::call(std::floor, x);
+			return detail::functor1<L, T, T, P>::call(std::floor, x);
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_ceil
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x)
 		{
-			return detail::functor1<D, T, T, P>::call(std::ceil, x);
+			return detail::functor1<L, T, T, P>::call(std::ceil, x);
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_fract
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x)
 		{
 			return x - floor(x);
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_trunc
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x)
 		{
-			return detail::functor1<D, T, T, P>::call(trunc, x);
+			return detail::functor1<L, T, T, P>::call(trunc, x);
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_round
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x)
 		{
-			return detail::functor1<D, T, T, P>::call(round, x);
+			return detail::functor1<L, T, T, P>::call(round, x);
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_mod
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & a, vecType<D, T, P> const & b)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & a, vecType<L, T, P> const & b)
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'mod' only accept floating-point inputs. Include <glm/gtc/integer.hpp> for integer inputs.");
 			return a - b * floor(a / b);
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_min_vector
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 		{
-			return detail::functor2<D, T, P>::call(min, x, y);
+			return detail::functor2<L, T, P>::call(min, x, y);
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_max_vector
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 		{
-			return detail::functor2<D, T, P>::call(max, x, y);
+			return detail::functor2<L, T, P>::call(max, x, y);
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_clamp_vector
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x, vecType<D, T, P> const & minVal, vecType<D, T, P> const & maxVal)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x, vecType<L, T, P> const & minVal, vecType<L, T, P> const & maxVal)
 		{
 			return min(max(x, minVal), maxVal);
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_step_vector
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & edge, vecType<D, T, P> const & x)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & edge, vecType<L, T, P> const & x)
 		{
-			return mix(vecType<D, T, P>(1), vecType<D, T, P>(0), glm::lessThan(x, edge));
+			return mix(vecType<L, T, P>(1), vecType<L, T, P>(0), glm::lessThan(x, edge));
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_smoothstep_vector
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & edge0, vecType<D, T, P> const & edge1, vecType<D, T, P> const & x)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & edge0, vecType<L, T, P> const & edge1, vecType<L, T, P> const & x)
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'step' only accept floating-point inputs");
-			vecType<D, T, P> const tmp(clamp((x - edge0) / (edge1 - edge0), static_cast<T>(0), static_cast<T>(1)));
+			vecType<L, T, P> const tmp(clamp((x - edge0) / (edge1 - edge0), static_cast<T>(0), static_cast<T>(1)));
 			return tmp * tmp * (static_cast<T>(3) - static_cast<T>(2) * tmp);
 		}
 	};
 }//namespace detail
 
-	template <typename genFIType>
+	template<typename genFIType>
 	GLM_FUNC_QUALIFIER genFIType abs(genFIType x)
 	{
 		return detail::compute_abs<genFIType, std::numeric_limits<genFIType>::is_signed>::call(x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> abs(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> abs(vecType<L, T, P> const & x)
 	{
-		return detail::compute_abs_vector<D, T, P, vecType, detail::is_aligned<P>::value>::call(x);
+		return detail::compute_abs_vector<L, T, P, vecType, detail::is_aligned<P>::value>::call(x);
 	}
 
 	// sign
 	// fast and works for any type
-	template <typename genFIType> 
+	template<typename genFIType> 
 	GLM_FUNC_QUALIFIER genFIType sign(genFIType x)
 	{
 		GLM_STATIC_ASSERT(
@@ -329,42 +329,42 @@ namespace detail
 		return detail::compute_sign<1, genFIType, defaultp, vec, std::numeric_limits<genFIType>::is_iec559, highp>::call(vec<1, genFIType>(x)).x;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> sign(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> sign(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(
 			std::numeric_limits<T>::is_iec559 || (std::numeric_limits<T>::is_signed && std::numeric_limits<T>::is_integer),
 			"'sign' only accept signed inputs");
 
-		return detail::compute_sign<D, T, P, vecType, std::numeric_limits<T>::is_iec559, detail::is_aligned<P>::value>::call(x);
+		return detail::compute_sign<L, T, P, vecType, std::numeric_limits<T>::is_iec559, detail::is_aligned<P>::value>::call(x);
 	}
 
 	// floor
 	using ::std::floor;
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> floor(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> floor(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'floor' only accept floating-point inputs.");
-		return detail::compute_floor<D, T, P, vecType, detail::is_aligned<P>::value>::call(x);
+		return detail::compute_floor<L, T, P, vecType, detail::is_aligned<P>::value>::call(x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> trunc(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> trunc(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'trunc' only accept floating-point inputs");
-		return detail::compute_trunc<D, T, P, vecType, detail::is_aligned<P>::value>::call(x);
+		return detail::compute_trunc<L, T, P, vecType, detail::is_aligned<P>::value>::call(x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> round(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> round(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'round' only accept floating-point inputs");
-		return detail::compute_round<D, T, P, vecType, detail::is_aligned<P>::value>::call(x);
+		return detail::compute_round<L, T, P, vecType, detail::is_aligned<P>::value>::call(x);
 	}
 
 /*
 	// roundEven
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType roundEven(genType const& x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'roundEven' only accept floating-point inputs");
@@ -374,7 +374,7 @@ namespace detail
 */
 
 	// roundEven
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType roundEven(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'roundEven' only accept floating-point inputs");
@@ -405,38 +405,38 @@ namespace detail
 		//}
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> roundEven(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> roundEven(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'roundEven' only accept floating-point inputs");
-		return detail::functor1<D, T, T, P>::call(roundEven, x);
+		return detail::functor1<L, T, T, P>::call(roundEven, x);
 	}
 
 	// ceil
 	using ::std::ceil;
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> ceil(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> ceil(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'ceil' only accept floating-point inputs");
-		return detail::compute_ceil<D, T, P, vecType, detail::is_aligned<P>::value>::call(x);
+		return detail::compute_ceil<L, T, P, vecType, detail::is_aligned<P>::value>::call(x);
 	}
 
 	// fract
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fract(genType x)
 	{
 		return fract(vec<1, genType>(x)).x;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fract(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fract(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'fract' only accept floating-point inputs");
-		return detail::compute_fract<D, T, P, vecType, detail::is_aligned<P>::value>::call(x);
+		return detail::compute_fract<L, T, P, vecType, detail::is_aligned<P>::value>::call(x);
 	}
 
 	// mod
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType mod(genType x, genType y)
 	{
 #		if GLM_COMPILER & GLM_COMPILER_CUDA
@@ -448,34 +448,34 @@ namespace detail
 #		endif
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> mod(vecType<D, T, P> const & x, T y)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> mod(vecType<L, T, P> const & x, T y)
 	{
-		return detail::compute_mod<D, T, P, vecType, detail::is_aligned<P>::value>::call(x, vecType<D, T, P>(y));
+		return detail::compute_mod<L, T, P, vecType, detail::is_aligned<P>::value>::call(x, vecType<L, T, P>(y));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> mod(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> mod(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 	{
-		return detail::compute_mod<D, T, P, vecType, detail::is_aligned<P>::value>::call(x, y);
+		return detail::compute_mod<L, T, P, vecType, detail::is_aligned<P>::value>::call(x, y);
 	}
 
 	// modf
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType modf(genType x, genType & i)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'modf' only accept floating-point inputs");
 		return std::modf(x, &i);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> modf(vec<1, T, P> const & x, vec<1, T, P> & i)
 	{
 		return vec<1, T, P>(
 			modf(x.x, i.x));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> modf(vec<2, T, P> const & x, vec<2, T, P> & i)
 	{
 		return vec<2, T, P>(
@@ -483,7 +483,7 @@ namespace detail
 			modf(x.y, i.y));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> modf(vec<3, T, P> const & x, vec<3, T, P> & i)
 	{
 		return vec<3, T, P>(
@@ -492,7 +492,7 @@ namespace detail
 			modf(x.z, i.z));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> modf(vec<4, T, P> const & x, vec<4, T, P> & i)
 	{
 		return vec<4, T, P>(
@@ -511,94 +511,94 @@ namespace detail
 	//CHAR_BIT - 1)));
 
 	// min
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> min(vecType<D, T, P> const & a, T b)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> min(vecType<L, T, P> const & a, T b)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'min' only accept floating-point inputs for the interpolator a");
-		return detail::compute_min_vector<D, T, P, vecType, detail::is_aligned<P>::value>::call(a, vecType<D, T, P>(b));
+		return detail::compute_min_vector<L, T, P, vecType, detail::is_aligned<P>::value>::call(a, vecType<L, T, P>(b));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> min(vecType<D, T, P> const & a, vecType<D, T, P> const & b)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> min(vecType<L, T, P> const & a, vecType<L, T, P> const & b)
 	{
-		return detail::compute_min_vector<D, T, P, vecType, detail::is_aligned<P>::value>::call(a, b);
+		return detail::compute_min_vector<L, T, P, vecType, detail::is_aligned<P>::value>::call(a, b);
 	}
 
 	// max
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> max(vecType<D, T, P> const & a, T b)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> max(vecType<L, T, P> const & a, T b)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'max' only accept floating-point inputs for the interpolator a");
-		return detail::compute_max_vector<D, T, P, vecType, detail::is_aligned<P>::value>::call(a, vecType<D, T, P>(b));
+		return detail::compute_max_vector<L, T, P, vecType, detail::is_aligned<P>::value>::call(a, vecType<L, T, P>(b));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> max(vecType<D, T, P> const & a, vecType<D, T, P> const & b)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> max(vecType<L, T, P> const & a, vecType<L, T, P> const & b)
 	{
-		return detail::compute_max_vector<D, T, P, vecType, detail::is_aligned<P>::value>::call(a, b);
+		return detail::compute_max_vector<L, T, P, vecType, detail::is_aligned<P>::value>::call(a, b);
 	}
 
 	// clamp
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType clamp(genType x, genType minVal, genType maxVal)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559 || std::numeric_limits<genType>::is_integer || GLM_UNRESTRICTED_GENTYPE, "'clamp' only accept floating-point or integer inputs");
 		return min(max(x, minVal), maxVal);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> clamp(vecType<D, T, P> const & x, T minVal, T maxVal)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> clamp(vecType<L, T, P> const & x, T minVal, T maxVal)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || std::numeric_limits<T>::is_integer || GLM_UNRESTRICTED_GENTYPE, "'clamp' only accept floating-point or integer inputs");
-		return detail::compute_clamp_vector<D, T, P, vecType, detail::is_aligned<P>::value>::call(x, vecType<D, T, P>(minVal), vecType<D, T, P>(maxVal));
+		return detail::compute_clamp_vector<L, T, P, vecType, detail::is_aligned<P>::value>::call(x, vecType<L, T, P>(minVal), vecType<L, T, P>(maxVal));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> clamp(vecType<D, T, P> const & x, vecType<D, T, P> const & minVal, vecType<D, T, P> const & maxVal)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> clamp(vecType<L, T, P> const & x, vecType<L, T, P> const & minVal, vecType<L, T, P> const & maxVal)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || std::numeric_limits<T>::is_integer || GLM_UNRESTRICTED_GENTYPE, "'clamp' only accept floating-point or integer inputs");
-		return detail::compute_clamp_vector<D, T, P, vecType, detail::is_aligned<P>::value>::call(x, minVal, maxVal);
+		return detail::compute_clamp_vector<L, T, P, vecType, detail::is_aligned<P>::value>::call(x, minVal, maxVal);
 	}
 
-	template <typename genTypeT, typename genTypeU>
+	template<typename genTypeT, typename genTypeU>
 	GLM_FUNC_QUALIFIER genTypeT mix(genTypeT x, genTypeT y, genTypeU a)
 	{
 		return detail::compute_mix<genTypeT, genTypeU>::call(x, y, a);
 	}
 
-	template <int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> mix(vecType<D, T, P> const & x, vecType<D, T, P> const & y, U a)
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> mix(vecType<L, T, P> const & x, vecType<L, T, P> const & y, U a)
 	{
-		return detail::compute_mix_scalar<D, T, U, P, vecType, detail::is_aligned<P>::value>::call(x, y, a);
+		return detail::compute_mix_scalar<L, T, U, P, vecType, detail::is_aligned<P>::value>::call(x, y, a);
 	}
 
-	template <int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> mix(vecType<D, T, P> const & x, vecType<D, T, P> const & y, vecType<D, U, P> const & a)
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> mix(vecType<L, T, P> const & x, vecType<L, T, P> const & y, vecType<L, U, P> const & a)
 	{
-		return detail::compute_mix_vector<D, T, U, P, vecType, detail::is_aligned<P>::value>::call(x, y, a);
+		return detail::compute_mix_vector<L, T, U, P, vecType, detail::is_aligned<P>::value>::call(x, y, a);
 	}
 
 	// step
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType step(genType edge, genType x)
 	{
 		return mix(static_cast<genType>(1), static_cast<genType>(0), glm::lessThan(x, edge));
 	}
 
-	template <template <int, typename, precision> class vecType, int D, typename T, precision P>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> step(T edge, vecType<D, T, P> const & x)
+	template<template<length_t, typename, precision> class vecType, length_t L, typename T, precision P>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> step(T edge, vecType<L, T, P> const & x)
 	{
-		return detail::compute_step_vector<D, T, P, vecType, detail::is_aligned<P>::value>::call(vecType<D, T, P>(edge), x);
+		return detail::compute_step_vector<L, T, P, vecType, detail::is_aligned<P>::value>::call(vecType<L, T, P>(edge), x);
 	}
 
-	template <template <int, typename, precision> class vecType, int D, typename T, precision P>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> step(vecType<D, T, P> const & edge, vecType<D, T, P> const & x)
+	template<template<length_t, typename, precision> class vecType, length_t L, typename T, precision P>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> step(vecType<L, T, P> const & edge, vecType<L, T, P> const & x)
 	{
-		return detail::compute_step_vector<D, T, P, vecType, detail::is_aligned<P>::value>::call(edge, x);
+		return detail::compute_step_vector<L, T, P, vecType, detail::is_aligned<P>::value>::call(edge, x);
 	}
 
 	// smoothstep
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType smoothstep(genType edge0, genType edge1, genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'smoothstep' only accept floating-point inputs");
@@ -607,22 +607,22 @@ namespace detail
 		return tmp * tmp * (genType(3) - genType(2) * tmp);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> smoothstep(T edge0, T edge1, vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> smoothstep(T edge0, T edge1, vecType<L, T, P> const & x)
 	{
-		return detail::compute_smoothstep_vector<D, T, P, vecType, detail::is_aligned<P>::value>::call(vecType<D, T, P>(edge0), vecType<D, T, P>(edge1), x);
+		return detail::compute_smoothstep_vector<L, T, P, vecType, detail::is_aligned<P>::value>::call(vecType<L, T, P>(edge0), vecType<L, T, P>(edge1), x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> smoothstep(vecType<D, T, P> const & edge0, vecType<D, T, P> const & edge1, vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> smoothstep(vecType<L, T, P> const & edge0, vecType<L, T, P> const & edge1, vecType<L, T, P> const & x)
 	{
-		return detail::compute_smoothstep_vector<D, T, P, vecType, detail::is_aligned<P>::value>::call(edge0, edge1, x);
+		return detail::compute_smoothstep_vector<L, T, P, vecType, detail::is_aligned<P>::value>::call(edge0, edge1, x);
 	}
 
 #	if GLM_HAS_CXX11_STL
 		using std::isnan;
 #	else
-		template <typename genType> 
+		template<typename genType> 
 		GLM_FUNC_QUALIFIER bool isnan(genType x)
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'isnan' only accept floating-point inputs");
@@ -647,18 +647,18 @@ namespace detail
 		}
 #	endif
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> isnan(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> isnan(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isnan' only accept floating-point inputs");
 
-		return detail::functor1<D, bool, T, P>::call(isnan, x);
+		return detail::functor1<L, bool, T, P>::call(isnan, x);
 	}
 
 #	if GLM_HAS_CXX11_STL
 		using std::isinf;
 #	else
-		template <typename genType> 
+		template<typename genType> 
 		GLM_FUNC_QUALIFIER bool isinf(genType x)
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'isinf' only accept floating-point inputs");
@@ -686,12 +686,12 @@ namespace detail
 	}
 #	endif
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> isinf(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> isinf(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isnan' only accept floating-point inputs");
 
-		return detail::functor1<D, bool, T, P>::call(isinf, x);
+		return detail::functor1<L, bool, T, P>::call(isinf, x);
 	}
 
 	GLM_FUNC_QUALIFIER int floatBitsToInt(float const & v)
@@ -699,10 +699,10 @@ namespace detail
 		return reinterpret_cast<int&>(const_cast<float&>(v));
 	}
 
-	template <template <int, typename, precision> class vecType, int D, precision P>
-	GLM_FUNC_QUALIFIER vecType<D, int, P> floatBitsToInt(vecType<D, float, P> const & v)
+	template<template<length_t, typename, precision> class vecType, length_t L, precision P>
+	GLM_FUNC_QUALIFIER vecType<L, int, P> floatBitsToInt(vecType<L, float, P> const & v)
 	{
-		return reinterpret_cast<vecType<D, int, P>&>(const_cast<vecType<D, float, P>&>(v));
+		return reinterpret_cast<vecType<L, int, P>&>(const_cast<vecType<L, float, P>&>(v));
 	}
 
 	GLM_FUNC_QUALIFIER uint floatBitsToUint(float const & v)
@@ -710,10 +710,10 @@ namespace detail
 		return reinterpret_cast<uint&>(const_cast<float&>(v));
 	}
 
-	template <template <int, typename, precision> class vecType, int D, precision P>
-	GLM_FUNC_QUALIFIER vecType<D, uint, P> floatBitsToUint(vecType<D, float, P> const & v)
+	template<template<length_t, typename, precision> class vecType, length_t L, precision P>
+	GLM_FUNC_QUALIFIER vecType<L, uint, P> floatBitsToUint(vecType<L, float, P> const & v)
 	{
-		return reinterpret_cast<vecType<D, uint, P>&>(const_cast<vecType<D, float, P>&>(v));
+		return reinterpret_cast<vecType<L, uint, P>&>(const_cast<vecType<L, float, P>&>(v));
 	}
 
 	GLM_FUNC_QUALIFIER float intBitsToFloat(int const & v)
@@ -721,10 +721,10 @@ namespace detail
 		return reinterpret_cast<float&>(const_cast<int&>(v));
 	}
 
-	template <template <int, typename, precision> class vecType, int D, precision P>
-	GLM_FUNC_QUALIFIER vecType<D, float, P> intBitsToFloat(vecType<D, int, P> const & v)
+	template<template<length_t, typename, precision> class vecType, length_t L, precision P>
+	GLM_FUNC_QUALIFIER vecType<L, float, P> intBitsToFloat(vecType<L, int, P> const & v)
 	{
-		return reinterpret_cast<vecType<D, float, P>&>(const_cast<vecType<D, int, P>&>(v));
+		return reinterpret_cast<vecType<L, float, P>&>(const_cast<vecType<L, int, P>&>(v));
 	}
 
 	GLM_FUNC_QUALIFIER float uintBitsToFloat(uint const & v)
@@ -732,19 +732,19 @@ namespace detail
 		return reinterpret_cast<float&>(const_cast<uint&>(v));
 	}
 
-	template <template <int, typename, precision> class vecType, int D, precision P>
-	GLM_FUNC_QUALIFIER vecType<D, float, P> uintBitsToFloat(vecType<D, uint, P> const & v)
+	template<template<length_t, typename, precision> class vecType, length_t L, precision P>
+	GLM_FUNC_QUALIFIER vecType<L, float, P> uintBitsToFloat(vecType<L, uint, P> const & v)
 	{
-		return reinterpret_cast<vecType<D, float, P>&>(const_cast<vecType<D, uint, P>&>(v));
+		return reinterpret_cast<vecType<L, float, P>&>(const_cast<vecType<L, uint, P>&>(v));
 	}
 	
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fma(genType const & a, genType const & b, genType const & c)
 	{
 		return a * b + c;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType frexp(genType x, int & exp)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'frexp' only accept floating-point inputs");
@@ -752,7 +752,7 @@ namespace detail
 		return std::frexp(x, &exp);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> frexp(vec<1, T, P> const & x, vec<1, int, P> & exp)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'frexp' only accept floating-point inputs");
@@ -760,7 +760,7 @@ namespace detail
 		return vec<1, T, P>(std::frexp(x.x, &exp.x));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> frexp(vec<2, T, P> const & x, vec<2, int, P> & exp)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'frexp' only accept floating-point inputs");
@@ -770,7 +770,7 @@ namespace detail
 			frexp(x.y, exp.y));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> frexp(vec<3, T, P> const & x, vec<3, int, P> & exp)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'frexp' only accept floating-point inputs");
@@ -781,7 +781,7 @@ namespace detail
 			frexp(x.z, exp.z));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> frexp(vec<4, T, P> const & x, vec<4, int, P> & exp)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'frexp' only accept floating-point inputs");
@@ -793,7 +793,7 @@ namespace detail
 			frexp(x.w, exp.w));
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType ldexp(genType const & x, int const & exp)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'ldexp' only accept floating-point inputs");
@@ -801,7 +801,7 @@ namespace detail
 		return std::ldexp(x, exp);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> ldexp(vec<1, T, P> const & x, vec<1, int, P> const & exp)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'ldexp' only accept floating-point inputs");
@@ -810,7 +810,7 @@ namespace detail
 			ldexp(x.x, exp.x));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> ldexp(vec<2, T, P> const & x, vec<2, int, P> const & exp)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'ldexp' only accept floating-point inputs");
@@ -820,7 +820,7 @@ namespace detail
 			ldexp(x.y, exp.y));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> ldexp(vec<3, T, P> const & x, vec<3, int, P> const & exp)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'ldexp' only accept floating-point inputs");
@@ -831,7 +831,7 @@ namespace detail
 			ldexp(x.z, exp.z));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> ldexp(vec<4, T, P> const & x, vec<4, int, P> const & exp)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'ldexp' only accept floating-point inputs");
diff --git a/glm/detail/func_common_simd.inl b/glm/detail/func_common_simd.inl
index 96f7d793..e6daa269 100644
--- a/glm/detail/func_common_simd.inl
+++ b/glm/detail/func_common_simd.inl
@@ -10,7 +10,7 @@
 namespace glm{
 namespace detail
 {
-	template <precision P>
+	template<precision P>
 	struct compute_abs_vector<4, float, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const & v)
@@ -21,7 +21,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_abs_vector<4, int, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, int, P> call(vec<4, int, P> const & v)
@@ -32,7 +32,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_floor<4, float, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const & v)
@@ -43,7 +43,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_ceil<4, float, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const & v)
@@ -54,7 +54,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_fract<4, float, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const & v)
@@ -65,7 +65,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_round<4, float, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const & v)
@@ -76,7 +76,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_mod<4, float, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const & x, vec<4, float, P> const & y)
@@ -87,7 +87,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_min_vector<4, float, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const & v1, vec<4, float, P> const & v2)
@@ -98,7 +98,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_min_vector<4, int32, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, int32, P> call(vec<4, int32, P> const & v1, vec<4, int32, P> const & v2)
@@ -109,7 +109,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_min_vector<4, uint32, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, int32, P> call(vec<4, uint32, P> const & v1, vec<4, uint32, P> const & v2)
@@ -120,7 +120,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_max_vector<4, float, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const & v1, vec<4, float, P> const & v2)
@@ -131,7 +131,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_max_vector<4, int32, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, int32, P> call(vec<4, int32, P> const & v1, vec<4, int32, P> const & v2)
@@ -142,7 +142,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_max_vector<4, uint32, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, uint32, P> call(vec<4, uint32, P> const & v1, vec<4, uint32, P> const & v2)
@@ -153,7 +153,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_clamp_vector<4, float, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const & x, vec<4, float, P> const & minVal, vec<4, float, P> const & maxVal)
@@ -164,7 +164,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_clamp_vector<4, int32, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, int32, P> call(vec<4, int32, P> const & x, vec<4, int32, P> const & minVal, vec<4, int32, P> const & maxVal)
@@ -175,7 +175,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_clamp_vector<4, uint32, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, uint32, P> call(vec<4, uint32, P> const & x, vec<4, uint32, P> const & minVal, vec<4, uint32, P> const & maxVal)
@@ -186,7 +186,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_mix_vector<4, float, bool, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const & x, vec<4, float, P> const & y, vec<4, bool, P> const & a)
@@ -204,7 +204,7 @@ namespace detail
 		}
 	};
 /* FIXME
-	template <precision P>
+	template<precision P>
 	struct compute_step_vector<float, P, tvec4>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const& edge, vec<4, float, P> const& x)
@@ -215,7 +215,7 @@ namespace detail
 		}
 	};
 */
-	template <precision P>
+	template<precision P>
 	struct compute_smoothstep_vector<4, float, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const& edge0, vec<4, float, P> const& edge1, vec<4, float, P> const& x)
diff --git a/glm/detail/func_exponential.hpp b/glm/detail/func_exponential.hpp
index 2b9d615d..89ba5806 100644
--- a/glm/detail/func_exponential.hpp
+++ b/glm/detail/func_exponential.hpp
@@ -29,8 +29,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/pow.xml">GLSL pow man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2 Exponential Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> pow(vecType<D, T, P> const & base, vecType<D, T, P> const & exponent);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> pow(vecType<L, T, P> const & base, vecType<L, T, P> const & exponent);
 
 	/// Returns the natural exponentiation of x, i.e., e^x.
 	///
@@ -39,8 +39,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/exp.xml">GLSL exp man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2 Exponential Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> exp(vecType<D, T, P> const & v);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> exp(vecType<L, T, P> const & v);
 
 	/// Returns the natural logarithm of v, i.e., 
 	/// returns the value y which satisfies the equation x = e^y. 
@@ -51,8 +51,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/log.xml">GLSL log man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2 Exponential Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> log(vecType<D, T, P> const & v);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> log(vecType<L, T, P> const & v);
 
 	/// Returns 2 raised to the v power.
 	/// 
@@ -61,8 +61,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/exp2.xml">GLSL exp2 man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2 Exponential Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> exp2(vecType<D, T, P> const & v);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> exp2(vecType<L, T, P> const & v);
 
 	/// Returns the base 2 log of x, i.e., returns the value y, 
 	/// which satisfies the equation x = 2 ^ y.
@@ -72,8 +72,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/log2.xml">GLSL log2 man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2 Exponential Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> log2(vecType<D, T, P> const & v);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> log2(vecType<L, T, P> const & v);
 
 	/// Returns the positive square root of v.
 	/// 
@@ -82,10 +82,10 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sqrt.xml">GLSL sqrt man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2 Exponential Functions</a>
-	//template <typename genType>
+	//template<typename genType>
 	//GLM_FUNC_DECL genType sqrt(genType const & x);
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> sqrt(vecType<D, T, P> const & v);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> sqrt(vecType<L, T, P> const & v);
 	
 	/// Returns the reciprocal of the positive square root of v.
 	/// 
@@ -94,8 +94,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/inversesqrt.xml">GLSL inversesqrt man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.2 Exponential Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> inversesqrt(vecType<D, T, P> const & v);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> inversesqrt(vecType<L, T, P> const & v);
 
 	/// @}
 }//namespace glm
diff --git a/glm/detail/func_exponential.inl b/glm/detail/func_exponential.inl
index f04d4a8c..3f51de1a 100644
--- a/glm/detail/func_exponential.inl
+++ b/glm/detail/func_exponential.inl
@@ -13,50 +13,50 @@ namespace detail
 #	if GLM_HAS_CXX11_STL
 		using std::log2;
 #	else
-		template <typename genType>
+		template<typename genType>
 		genType log2(genType Value)
 		{
 			return std::log(Value) * static_cast<genType>(1.4426950408889634073599246810019);
 		}
 #	endif
 
-	template <int D, typename T, precision P, template <int, class, precision> class vecType, bool isFloat, bool Aligned>
+	template<length_t L, typename T, precision P, template<int, class, precision> class vecType, bool isFloat, bool Aligned>
 	struct compute_log2
 	{
-		GLM_FUNC_QUALIFIER static vec<D, T, P> call(vec<D, T, P> const & vec)
+		GLM_FUNC_QUALIFIER static vec<L, T, P> call(vec<L, T, P> const& v)
 		{
-			return detail::functor1<D, T, T, P>::call(log2, vec);
+			return detail::functor1<L, T, T, P>::call(log2, v);
 		}
 	};
 
-	template <int D, typename T, precision P, bool Aligned>
+	template<length_t L, typename T, precision P, bool Aligned>
 	struct compute_sqrt
 	{
-		GLM_FUNC_QUALIFIER static vec<D, T, P> call(vec<D, T, P> const & x)
+		GLM_FUNC_QUALIFIER static vec<L, T, P> call(vec<L, T, P> const& x)
 		{
-			return detail::functor1<D, T, T, P>::call(std::sqrt, x);
+			return detail::functor1<L, T, T, P>::call(std::sqrt, x);
 		}
 	};
 
-	template <int D, typename T, precision P, bool Aligned>
+	template<length_t L, typename T, precision P, bool Aligned>
 	struct compute_inversesqrt
 	{
-		GLM_FUNC_QUALIFIER static vec<D, T, P> call(vec<D, T, P> const & x)
+		GLM_FUNC_QUALIFIER static vec<L, T, P> call(vec<L, T, P> const & x)
 		{
 			return static_cast<T>(1) / sqrt(x);
 		}
 	};
 		
-	template <int D, bool Aligned>
-	struct compute_inversesqrt<D, float, lowp, Aligned>
+	template<length_t L, bool Aligned>
+	struct compute_inversesqrt<L, float, lowp, Aligned>
 	{
-		GLM_FUNC_QUALIFIER static vec<D, float, lowp> call(vec<D, float, lowp> const & x)
+		GLM_FUNC_QUALIFIER static vec<L, float, lowp> call(vec<L, float, lowp> const & x)
 		{
-			vec<D, float, lowp> tmp(x);
-			vec<D, float, lowp> xhalf(tmp * 0.5f);
-			vec<D, uint, lowp>* p = reinterpret_cast<vec<D, uint, lowp>*>(const_cast<vec<D, float, lowp>*>(&x));
-			vec<D, uint, lowp> i = vec<D, uint, lowp>(0x5f375a86) - (*p >> vec<D, uint, lowp>(1));
-			vec<D, float, lowp>* ptmp = reinterpret_cast<vec<D, float, lowp>*>(&i);
+			vec<L, float, lowp> tmp(x);
+			vec<L, float, lowp> xhalf(tmp * 0.5f);
+			vec<L, uint, lowp>* p = reinterpret_cast<vec<L, uint, lowp>*>(const_cast<vec<L, float, lowp>*>(&x));
+			vec<L, uint, lowp> i = vec<L, uint, lowp>(0x5f375a86) - (*p >> vec<L, uint, lowp>(1));
+			vec<L, float, lowp>* ptmp = reinterpret_cast<vec<L, float, lowp>*>(&i);
 			tmp = *ptmp;
 			tmp = tmp * (1.5f - xhalf * tmp * tmp);
 			return tmp;
@@ -66,30 +66,30 @@ namespace detail
 
 	// pow
 	using std::pow;
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> pow(vecType<D, T, P> const & base, vecType<D, T, P> const & exponent)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> pow(vecType<L, T, P> const & base, vecType<L, T, P> const& exponent)
 	{
-		return detail::functor2<D, T, P>::call(pow, base, exponent);
+		return detail::functor2<L, T, P>::call(pow, base, exponent);
 	}
 
 	// exp
 	using std::exp;
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> exp(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> exp(vecType<L, T, P> const& x)
 	{
-		return detail::functor1<D, T, T, P>::call(exp, x);
+		return detail::functor1<L, T, T, P>::call(exp, x);
 	}
 
 	// log
 	using std::log;
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> log(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> log(vecType<L, T, P> const& x)
 	{
-		return detail::functor1<D, T, T, P>::call(log, x);
+		return detail::functor1<L, T, T, P>::call(log, x);
 	}
 
 	//exp2, ln2 = 0.69314718055994530941723212145818f
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType exp2(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'exp2' only accept floating-point inputs");
@@ -97,46 +97,46 @@ namespace detail
 		return std::exp(static_cast<genType>(0.69314718055994530941723212145818) * x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> exp2(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> exp2(vecType<L, T, P> const& x)
 	{
-		return detail::functor1<D, T, T, P>::call(exp2, x);
+		return detail::functor1<L, T, T, P>::call(exp2, x);
 	}
 
 	// log2, ln2 = 0.69314718055994530941723212145818f
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType log2(genType x)
 	{
 		return log2(vec<1, genType>(x)).x;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> log2(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> log2(vecType<L, T, P> const& x)
 	{
-		return detail::compute_log2<D, T, P, vecType, std::numeric_limits<T>::is_iec559, detail::is_aligned<P>::value>::call(x);
+		return detail::compute_log2<L, T, P, vecType, std::numeric_limits<T>::is_iec559, detail::is_aligned<P>::value>::call(x);
 	}
 
 	// sqrt
 	using std::sqrt;
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> sqrt(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> sqrt(vecType<L, T, P> const& x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'sqrt' only accept floating-point inputs");
-		return detail::compute_sqrt<D, T, P, detail::is_aligned<P>::value>::call(x);
+		return detail::compute_sqrt<L, T, P, detail::is_aligned<P>::value>::call(x);
 	}
 
 	// inversesqrt
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType inversesqrt(genType x)
 	{
 		return static_cast<genType>(1) / sqrt(x);
 	}
 	
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> inversesqrt(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> inversesqrt(vecType<L, T, P> const& x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'inversesqrt' only accept floating-point inputs");
-		return detail::compute_inversesqrt<D, T, P, detail::is_aligned<P>::value>::call(x);
+		return detail::compute_inversesqrt<L, T, P, detail::is_aligned<P>::value>::call(x);
 	}
 }//namespace glm
 
diff --git a/glm/detail/func_exponential_simd.inl b/glm/detail/func_exponential_simd.inl
index fb964e21..9ac60ba9 100644
--- a/glm/detail/func_exponential_simd.inl
+++ b/glm/detail/func_exponential_simd.inl
@@ -8,7 +8,7 @@
 namespace glm{
 namespace detail
 {
-	template <precision P>
+	template<precision P>
 	struct compute_sqrt<4, float, P, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const & v)
@@ -19,7 +19,7 @@ namespace detail
 		}
 	};
 
-	template <>
+	template<>
 	struct compute_sqrt<4, float, aligned_lowp, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, aligned_lowp> call(vec<4, float, aligned_lowp> const & v)
diff --git a/glm/detail/func_geometric.hpp b/glm/detail/func_geometric.hpp
index 54484ebf..d5a737b5 100644
--- a/glm/detail/func_geometric.hpp
+++ b/glm/detail/func_geometric.hpp
@@ -23,9 +23,9 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/length.xml">GLSL length man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_DECL T length(
-		vecType<D, T, P> const & x);
+		vecType<L, T, P> const& x);
 
 	/// Returns the distance betwwen p0 and p1, i.e., length(p0 - p1).
 	///
@@ -33,10 +33,10 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/distance.xml">GLSL distance man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_DECL T distance(
-		vecType<D, T, P> const & p0,
-		vecType<D, T, P> const & p1);
+		vecType<L, T, P> const& p0,
+		vecType<L, T, P> const& p1);
 
 	/// Returns the dot product of x and y, i.e., result = x * y.
 	///
@@ -44,10 +44,10 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/dot.xml">GLSL dot man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
-	template <int D, typename T, precision P>
+	template<length_t L, typename T, precision P>
 	GLM_FUNC_DECL T dot(
-		vec<D, T, P> const & x,
-		vec<D, T, P> const & y);
+		vec<L, T, P> const & x,
+		vec<L, T, P> const & y);
 
 	/// Returns the cross product of x and y.
 	///
@@ -55,7 +55,7 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/cross.xml">GLSL cross man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> cross(
 		vec<3, T, P> const & x,
 		vec<3, T, P> const & y);
@@ -65,9 +65,9 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/normalize.xml">GLSL normalize man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> normalize(
-		vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> normalize(
+		vecType<L, T, P> const& x);
 
 	/// If dot(Nref, I) < 0.0, return N, otherwise, return -N.
 	///
@@ -75,11 +75,11 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/faceforward.xml">GLSL faceforward man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> faceforward(
-		vecType<D, T, P> const & N,
-		vecType<D, T, P> const & I,
-		vecType<D, T, P> const & Nref);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> faceforward(
+		vecType<L, T, P> const& N,
+		vecType<L, T, P> const& I,
+		vecType<L, T, P> const& Nref);
 
 	/// For the incident vector I and surface orientation N, 
 	/// returns the reflection direction : result = I - 2.0 * dot(N, I) * N.
@@ -88,7 +88,7 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/reflect.xml">GLSL reflect man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType reflect(
 		genType const & I,
 		genType const & N);
@@ -101,10 +101,10 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/refract.xml">GLSL refract man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.5 Geometric Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> refract(
-		vecType<D, T, P> const & I,
-		vecType<D, T, P> const & N,
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> refract(
+		vecType<L, T, P> const& I,
+		vecType<L, T, P> const& N,
 		T eta);
 
 	/// @}
diff --git a/glm/detail/func_geometric.inl b/glm/detail/func_geometric.inl
index 0620fc51..dd891d63 100644
--- a/glm/detail/func_geometric.inl
+++ b/glm/detail/func_geometric.inl
@@ -10,28 +10,28 @@
 namespace glm{
 namespace detail
 {
-	template <template <int, typename, precision> class vecType, int D, typename T, precision P, bool Aligned>
+	template<template<length_t, typename, precision> class vecType, length_t L, typename T, precision P, bool Aligned>
 	struct compute_length
 	{
-		GLM_FUNC_QUALIFIER static T call(vecType<D, T, P> const & v)
+		GLM_FUNC_QUALIFIER static T call(vecType<L, T, P> const & v)
 		{
 			return sqrt(dot(v, v));
 		}
 	};
 
-	template <template <int, typename, precision> class vecType, int D, typename T, precision P, bool Aligned>
+	template<template<length_t, typename, precision> class vecType, length_t L, typename T, precision P, bool Aligned>
 	struct compute_distance
 	{
-		GLM_FUNC_QUALIFIER static T call(vecType<D, T, P> const & p0, vecType<D, T, P> const & p1)
+		GLM_FUNC_QUALIFIER static T call(vecType<L, T, P> const & p0, vecType<L, T, P> const & p1)
 		{
 			return length(p1 - p0);
 		}
 	};
 
-	template <typename V, typename T, bool Aligned>
+	template<typename V, typename T, bool Aligned>
 	struct compute_dot{};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_dot<vec<1, T, P>, T, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static T call(vec<1, T, P> const & a, vec<1, T, P> const & b)
@@ -40,7 +40,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_dot<vec<2, T, P>, T, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static T call(vec<2, T, P> const & a, vec<2, T, P> const & b)
@@ -50,7 +50,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_dot<vec<3, T, P>, T, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static T call(vec<3, T, P> const & a, vec<3, T, P> const & b)
@@ -60,7 +60,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_dot<vec<4, T, P>, T, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static T call(vec<4, T, P> const & a, vec<4, T, P> const & b)
@@ -70,7 +70,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_cross
 	{
 		GLM_FUNC_QUALIFIER static vec<3, T, P> call(vec<3, T, P> const & x, vec<3, T, P> const & y)
@@ -84,10 +84,10 @@ namespace detail
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_normalize
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & v)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & v)
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'normalize' accepts only floating-point inputs");
 
@@ -95,10 +95,10 @@ namespace detail
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_faceforward
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & N, vecType<D, T, P> const & I, vecType<D, T, P> const & Nref)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & N, vecType<L, T, P> const & I, vecType<L, T, P> const & Nref)
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'normalize' accepts only floating-point inputs");
 
@@ -106,19 +106,19 @@ namespace detail
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_reflect
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & I, vecType<D, T, P> const & N)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & I, vecType<L, T, P> const & N)
 		{
 			return I - N * dot(N, I) * static_cast<T>(2);
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
 	struct compute_refract
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & I, vecType<D, T, P> const & N, T eta)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & I, vecType<L, T, P> const & N, T eta)
 		{
 			T const dotValue(dot(N, I));
 			T const k(static_cast<T>(1) - eta * eta * (static_cast<T>(1) - dotValue * dotValue));
@@ -128,7 +128,7 @@ namespace detail
 }//namespace detail
 
 	// length
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType length(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'length' accepts only floating-point inputs");
@@ -136,16 +136,16 @@ namespace detail
 		return abs(x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T length(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER T length(vecType<L, T, P> const & v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'length' accepts only floating-point inputs");
 
-		return detail::compute_length<vecType, D, T, P, detail::is_aligned<P>::value>::call(v);
+		return detail::compute_length<vecType, L, T, P, detail::is_aligned<P>::value>::call(v);
 	}
 
 	// distance
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType distance(genType const & p0, genType const & p1)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'distance' accepts only floating-point inputs");
@@ -153,28 +153,28 @@ namespace detail
 		return length(p1 - p0);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T distance(vecType<D, T, P> const & p0, vecType<D, T, P> const & p1)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER T distance(vecType<L, T, P> const & p0, vecType<L, T, P> const & p1)
 	{
-		return detail::compute_distance<vecType, D, T, P, detail::is_aligned<P>::value>::call(p0, p1);
+		return detail::compute_distance<vecType, L, T, P, detail::is_aligned<P>::value>::call(p0, p1);
 	}
 
 	// dot
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T dot(T x, T y)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'dot' accepts only floating-point inputs");
 		return x * y;
 	}
 
-	template <int D, typename T, precision P>
-	GLM_FUNC_QUALIFIER T dot(vec<D, T, P> const & x, vec<D, T, P> const & y)
+	template<length_t L, typename T, precision P>
+	GLM_FUNC_QUALIFIER T dot(vec<L, T, P> const & x, vec<L, T, P> const & y)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'dot' accepts only floating-point inputs");
-		return detail::compute_dot<vec<D, T, P>, T, detail::is_aligned<P>::value>::call(x, y);
+		return detail::compute_dot<vec<L, T, P>, T, detail::is_aligned<P>::value>::call(x, y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T dot(tquat<T, P> const & x, tquat<T, P> const & y)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'dot' accepts only floating-point inputs");
@@ -182,14 +182,14 @@ namespace detail
 	}
 
 	// cross
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> cross(vec<3, T, P> const & x, vec<3, T, P> const & y)
 	{
 		return detail::compute_cross<T, P, detail::is_aligned<P>::value>::call(x, y);
 	}
 
 	// normalize
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType normalize(genType const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'normalize' accepts only floating-point inputs");
@@ -197,42 +197,42 @@ namespace detail
 		return x < genType(0) ? genType(-1) : genType(1);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> normalize(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> normalize(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'normalize' accepts only floating-point inputs");
 
-		return detail::compute_normalize<D, T, P, vecType, detail::is_aligned<P>::value>::call(x);
+		return detail::compute_normalize<L, T, P, vecType, detail::is_aligned<P>::value>::call(x);
 	}
 
 	// faceforward
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType faceforward(genType const & N, genType const & I, genType const & Nref)
 	{
 		return dot(Nref, I) < static_cast<genType>(0) ? N : -N;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> faceforward(vecType<D, T, P> const & N, vecType<D, T, P> const & I, vecType<D, T, P> const & Nref)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> faceforward(vecType<L, T, P> const & N, vecType<L, T, P> const & I, vecType<L, T, P> const & Nref)
 	{
-		return detail::compute_faceforward<D, T, P, vecType, detail::is_aligned<P>::value>::call(N, I, Nref);
+		return detail::compute_faceforward<L, T, P, vecType, detail::is_aligned<P>::value>::call(N, I, Nref);
 	}
 
 	// reflect
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType reflect(genType const & I, genType const & N)
 	{
 		return I - N * dot(N, I) * genType(2);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> reflect(vecType<D, T, P> const & I, vecType<D, T, P> const & N)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> reflect(vecType<L, T, P> const & I, vecType<L, T, P> const & N)
 	{
-		return detail::compute_reflect<D, T, P, vecType, detail::is_aligned<P>::value>::call(I, N);
+		return detail::compute_reflect<L, T, P, vecType, detail::is_aligned<P>::value>::call(I, N);
 	}
 
 	// refract
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType refract(genType const & I, genType const & N, genType eta)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'refract' accepts only floating-point inputs");
@@ -241,11 +241,11 @@ namespace detail
 		return (eta * I - (eta * dotValue + sqrt(k)) * N) * static_cast<genType>(k >= static_cast<genType>(0));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> refract(vecType<D, T, P> const & I, vecType<D, T, P> const & N, T eta)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> refract(vecType<L, T, P> const & I, vecType<L, T, P> const & N, T eta)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'refract' accepts only floating-point inputs");
-		return detail::compute_refract<D, T, P, vecType, detail::is_aligned<P>::value>::call(I, N, eta);
+		return detail::compute_refract<L, T, P, vecType, detail::is_aligned<P>::value>::call(I, N, eta);
 	}
 }//namespace glm
 
diff --git a/glm/detail/func_geometric_simd.inl b/glm/detail/func_geometric_simd.inl
index 0c56ad2d..7ddf9e05 100644
--- a/glm/detail/func_geometric_simd.inl
+++ b/glm/detail/func_geometric_simd.inl
@@ -8,7 +8,7 @@
 namespace glm{
 namespace detail
 {
-	template <precision P>
+	template<precision P>
 	struct compute_length<vec, 4, float, P, true>
 	{
 		GLM_FUNC_QUALIFIER static float call(vec<4, float, P> const & v)
@@ -17,7 +17,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_distance<vec, 4, float, P, true>
 	{
 		GLM_FUNC_QUALIFIER static float call(vec<4, float, P> const & p0, vec<4, float, P> const & p1)
@@ -26,7 +26,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_dot<vec<4, float, P>, float, true>
 	{
 		GLM_FUNC_QUALIFIER static float call(vec<4, float, P> const& x, vec<4, float, P> const& y)
@@ -35,7 +35,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_cross<float, P, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<3, float, P> call(vec<3, float, P> const & a, vec<3, float, P> const & b)
@@ -50,7 +50,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_normalize<4, float, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const & v)
@@ -61,7 +61,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_faceforward<4, float, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const& N, vec<4, float, P> const& I, vec<4, float, P> const& Nref)
@@ -72,7 +72,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_reflect<4, float, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const& I, vec<4, float, P> const& N)
@@ -83,7 +83,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_refract<4, float, P, vec, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, float, P> call(vec<4, float, P> const& I, vec<4, float, P> const& N, float eta)
diff --git a/glm/detail/func_integer.hpp b/glm/detail/func_integer.hpp
index 4c69fac5..375d6014 100644
--- a/glm/detail/func_integer.hpp
+++ b/glm/detail/func_integer.hpp
@@ -30,11 +30,11 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/uaddCarry.xml">GLSL uaddCarry man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, uint, P> uaddCarry(
-		vecType<D, uint, P> const & x,
-		vecType<D, uint, P> const & y,
-		vecType<D, uint, P> & carry);
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, uint, P> uaddCarry(
+		vecType<L, uint, P> const & x,
+		vecType<L, uint, P> const & y,
+		vecType<L, uint, P> & carry);
 
 	/// Subtracts the 32-bit unsigned integer y from x, returning
 	/// the difference if non-negative, or pow(2, 32) plus the difference
@@ -44,11 +44,11 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/usubBorrow.xml">GLSL usubBorrow man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, uint, P> usubBorrow(
-		vecType<D, uint, P> const & x,
-		vecType<D, uint, P> const & y,
-		vecType<D, uint, P> & borrow);
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, uint, P> usubBorrow(
+		vecType<L, uint, P> const & x,
+		vecType<L, uint, P> const & y,
+		vecType<L, uint, P> & borrow);
 
 	/// Multiplies 32-bit integers x and y, producing a 64-bit
 	/// result. The 32 least-significant bits are returned in lsb.
@@ -58,12 +58,12 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/umulExtended.xml">GLSL umulExtended man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
-	template <int D, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_DECL void umulExtended(
-		vecType<D, uint, P> const & x,
-		vecType<D, uint, P> const & y,
-		vecType<D, uint, P> & msb,
-		vecType<D, uint, P> & lsb);
+		vecType<L, uint, P> const & x,
+		vecType<L, uint, P> const & y,
+		vecType<L, uint, P> & msb,
+		vecType<L, uint, P> & lsb);
 		
 	/// Multiplies 32-bit integers x and y, producing a 64-bit
 	/// result. The 32 least-significant bits are returned in lsb.
@@ -73,12 +73,12 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/imulExtended.xml">GLSL imulExtended man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
-	template <int D, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_DECL void imulExtended(
-		vecType<D, int, P> const & x,
-		vecType<D, int, P> const & y,
-		vecType<D, int, P> & msb,
-		vecType<D, int, P> & lsb);
+		vecType<L, int, P> const & x,
+		vecType<L, int, P> const & y,
+		vecType<L, int, P> & msb,
+		vecType<L, int, P> & lsb);
 
 	/// Extracts bits [offset, offset + bits - 1] from value,
 	/// returning them in the least significant bits of the result.
@@ -95,9 +95,9 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitfieldExtract.xml">GLSL bitfieldExtract man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> bitfieldExtract(
-		vecType<D, T, P> const & Value,
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> bitfieldExtract(
+		vecType<L, T, P> const& Value,
 		int Offset,
 		int Bits);
 
@@ -115,10 +115,10 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitfieldInsert.xml">GLSL bitfieldInsert man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> bitfieldInsert(
-		vecType<D, T, P> const & Base,
-		vecType<D, T, P> const & Insert,
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> bitfieldInsert(
+		vecType<L, T, P> const& Base,
+		vecType<L, T, P> const& Insert,
 		int Offset,
 		int Bits);
 
@@ -130,8 +130,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitfieldReverse.xml">GLSL bitfieldReverse man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> bitfieldReverse(vecType<D, T, P> const & v);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> bitfieldReverse(vecType<L, T, P> const & v);
 
 	/// Returns the number of bits set to 1 in the binary representation of value.
 	///
@@ -139,7 +139,7 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitCount.xml">GLSL bitCount man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL int bitCount(genType v);
 
 	/// Returns the number of bits set to 1 in the binary representation of value.
@@ -148,8 +148,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitCount.xml">GLSL bitCount man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, int, P> bitCount(vecType<D, T, P> const & v);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, int, P> bitCount(vecType<L, T, P> const & v);
 
 	/// Returns the bit number of the least significant bit set to
 	/// 1 in the binary representation of value. 
@@ -159,7 +159,7 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/findLSB.xml">GLSL findLSB man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL int findLSB(genIUType x);
 
 	/// Returns the bit number of the least significant bit set to
@@ -170,8 +170,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/findLSB.xml">GLSL findLSB man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, int, P> findLSB(vecType<D, T, P> const & v);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, int, P> findLSB(vecType<L, T, P> const & v);
 
 	/// Returns the bit number of the most significant bit in the binary representation of value.
 	/// For positive integers, the result will be the bit number of the most significant bit set to 1. 
@@ -182,7 +182,7 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/findMSB.xml">GLSL findMSB man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL int findMSB(genIUType x);
 
 	/// Returns the bit number of the most significant bit in the binary representation of value.
@@ -194,8 +194,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/findMSB.xml">GLSL findMSB man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.8 Integer Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, int, P> findMSB(vecType<D, T, P> const & v);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, int, P> findMSB(vecType<L, T, P> const & v);
 
 	/// @}
 }//namespace glm
diff --git a/glm/detail/func_integer.inl b/glm/detail/func_integer.inl
index c52f125f..d4b184c8 100644
--- a/glm/detail/func_integer.inl
+++ b/glm/detail/func_integer.inl
@@ -24,49 +24,49 @@
 namespace glm{
 namespace detail
 {
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T mask(T Bits)
 	{
 		return Bits >= sizeof(T) * 8 ? ~static_cast<T>(0) : (static_cast<T>(1) << Bits) - static_cast<T>(1);
 	}
 
-	template <int D, typename T, glm::precision P, template <int, typename, precision> class vecType, bool Aligned, bool EXEC>
+	template<length_t L, typename T, glm::precision P, template<length_t, typename, precision> class vecType, bool Aligned, bool EXEC>
 	struct compute_bitfieldReverseStep
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & v, T, T)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const& v, T, T)
 		{
 			return v;
 		}
 	};
 
-	template <int D, typename T, glm::precision P, template <int, typename, precision> class vecType, bool Aligned>
-	struct compute_bitfieldReverseStep<D, T, P, vecType, Aligned, true>
+	template<length_t L, typename T, glm::precision P, template<length_t, typename, precision> class vecType, bool Aligned>
+	struct compute_bitfieldReverseStep<L, T, P, vecType, Aligned, true>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & v, T Mask, T Shift)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const& v, T Mask, T Shift)
 		{
 			return (v & Mask) << Shift | (v & (~Mask)) >> Shift;
 		}
 	};
 
-	template <int D, typename T, glm::precision P, template <int, typename, precision> class vecType, bool Aligned, bool EXEC>
+	template<length_t L, typename T, glm::precision P, template<length_t, typename, precision> class vecType, bool Aligned, bool EXEC>
 	struct compute_bitfieldBitCountStep
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & v, T, T)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const& v, T, T)
 		{
 			return v;
 		}
 	};
 
-	template <int D, typename T, glm::precision P, template <int, typename, precision> class vecType, bool Aligned>
-	struct compute_bitfieldBitCountStep<D, T, P, vecType, Aligned, true>
+	template<length_t L, typename T, glm::precision P, template<length_t, typename, precision> class vecType, bool Aligned>
+	struct compute_bitfieldBitCountStep<L, T, P, vecType, Aligned, true>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & v, T Mask, T Shift)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const& v, T Mask, T Shift)
 		{
 			return (v & Mask) + ((v >> Shift) & Mask);
 		}
 	};
 
-	template <typename genIUType, size_t Bits>
+	template<typename genIUType, size_t Bits>
 	struct compute_findLSB
 	{
 		GLM_FUNC_QUALIFIER static int call(genIUType Value)
@@ -79,7 +79,7 @@ namespace detail
 	};
 
 #	if GLM_HAS_BITSCAN_WINDOWS
-		template <typename genIUType>
+		template<typename genIUType>
 		struct compute_findLSB<genIUType, 32>
 		{
 			GLM_FUNC_QUALIFIER static int call(genIUType Value)
@@ -91,7 +91,7 @@ namespace detail
 		};
 
 #		if !((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_MODEL == GLM_MODEL_32))
-		template <typename genIUType>
+		template<typename genIUType>
 		struct compute_findLSB<genIUType, 64>
 		{
 			GLM_FUNC_QUALIFIER static int call(genIUType Value)
@@ -104,42 +104,42 @@ namespace detail
 #		endif
 #	endif//GLM_HAS_BITSCAN_WINDOWS
 
-	template <int D, typename T, glm::precision P, template <int, typename, precision> class vecType, bool EXEC = true>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool EXEC = true>
 	struct compute_findMSB_step_vec
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x, T Shift)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x, T Shift)
 		{
 			return x | (x >> Shift);
 		}
 	};
 
-	template <int D, typename T, glm::precision P, template <int, typename, precision> class vecType>
-	struct compute_findMSB_step_vec<D, T, P, vecType, false>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_findMSB_step_vec<L, T, P, vecType, false>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x, T)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const& x, T)
 		{
 			return x;
 		}
 	};
 
-		template <int D, typename T, glm::precision P, template <int, typename, precision> class vecType, int>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, int>
 	struct compute_findMSB_vec
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, int, P> call(vecType<D, T, P> const & vec)
+		GLM_FUNC_QUALIFIER static vecType<L, int, P> call(vecType<L, T, P> const& v)
 		{
-			vecType<D, T, P> x(vec);
-			x = compute_findMSB_step_vec<D, T, P, vecType, sizeof(T) * 8 >=  8>::call(x, static_cast<T>( 1));
-			x = compute_findMSB_step_vec<D, T, P, vecType, sizeof(T) * 8 >=  8>::call(x, static_cast<T>( 2));
-			x = compute_findMSB_step_vec<D, T, P, vecType, sizeof(T) * 8 >=  8>::call(x, static_cast<T>( 4));
-			x = compute_findMSB_step_vec<D, T, P, vecType, sizeof(T) * 8 >= 16>::call(x, static_cast<T>( 8));
-			x = compute_findMSB_step_vec<D, T, P, vecType, sizeof(T) * 8 >= 32>::call(x, static_cast<T>(16));
-			x = compute_findMSB_step_vec<D, T, P, vecType, sizeof(T) * 8 >= 64>::call(x, static_cast<T>(32));
-			return vecType<D, int, P>(sizeof(T) * 8 - 1) - glm::bitCount(~x);
+			vecType<L, T, P> x(v);
+			x = compute_findMSB_step_vec<L, T, P, vecType, sizeof(T) * 8 >=  8>::call(x, static_cast<T>( 1));
+			x = compute_findMSB_step_vec<L, T, P, vecType, sizeof(T) * 8 >=  8>::call(x, static_cast<T>( 2));
+			x = compute_findMSB_step_vec<L, T, P, vecType, sizeof(T) * 8 >=  8>::call(x, static_cast<T>( 4));
+			x = compute_findMSB_step_vec<L, T, P, vecType, sizeof(T) * 8 >= 16>::call(x, static_cast<T>( 8));
+			x = compute_findMSB_step_vec<L, T, P, vecType, sizeof(T) * 8 >= 32>::call(x, static_cast<T>(16));
+			x = compute_findMSB_step_vec<L, T, P, vecType, sizeof(T) * 8 >= 64>::call(x, static_cast<T>(32));
+			return vecType<L, int, P>(sizeof(T) * 8 - 1) - glm::bitCount(~x);
 		}
 	};
 
 #	if GLM_HAS_BITSCAN_WINDOWS
-		template <typename genIUType>
+		template<typename genIUType>
 		GLM_FUNC_QUALIFIER int compute_findMSB_32(genIUType Value)
 		{
 			unsigned long Result(0);
@@ -147,17 +147,17 @@ namespace detail
 			return IsNotNull ? int(Result) : -1;
 		}
 
-		template <int D, typename T, glm::precision P, template<int, typename, precision> class vecType>
-		struct compute_findMSB_vec<D, T, P, vecType, 32>
+		template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+		struct compute_findMSB_vec<L, T, P, vecType, 32>
 		{
-			GLM_FUNC_QUALIFIER static vecType<D, int, P> call(vecType<D, T, P> const & x)
+			GLM_FUNC_QUALIFIER static vecType<L, int, P> call(vecType<L, T, P> const& x)
 			{
-				return detail::functor1<D, int, T, P>::call(compute_findMSB_32, x);
+				return detail::functor1<L, int, T, P>::call(compute_findMSB_32, x);
 			}
 		};
 
 #		if !((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_MODEL == GLM_MODEL_32))
-		template <typename genIUType>
+		template<typename genIUType>
 		GLM_FUNC_QUALIFIER int compute_findMSB_64(genIUType Value)
 		{
 			unsigned long Result(0);
@@ -165,12 +165,12 @@ namespace detail
 			return IsNotNull ? int(Result) : -1;
 		}
 
-		template <int D, typename T, glm::precision P, template <int, typename, precision> class vecType>
-		struct compute_findMSB_vec<D, T, P, vecType, 64>
+		template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+		struct compute_findMSB_vec<L, T, P, vecType, 64>
 		{
-			GLM_FUNC_QUALIFIER static vecType<D, int, P> call(vecType<D, T, P> const & x)
+			GLM_FUNC_QUALIFIER static vecType<L, int, P> call(vecType<L, T, P> const& x)
 			{
-				return detail::functor1<D, int, T, P>::call(compute_findMSB_64, x);
+				return detail::functor1<L, int, T, P>::call(compute_findMSB_64, x);
 			}
 		};
 #		endif
@@ -186,13 +186,13 @@ namespace detail
 		return static_cast<uint32>(Value64 % (Max32 + static_cast<uint64>(1)));
 	}
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, uint, P> uaddCarry(vecType<D, uint, P> const & x, vecType<D, uint, P> const & y, vecType<D, uint, P> & Carry)
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, uint, P> uaddCarry(vecType<L, uint, P> const& x, vecType<L, uint, P> const& y, vecType<L, uint, P>& Carry)
 	{
-		vecType<D, uint64, P> Value64(vecType<D, uint64, P>(x) + vecType<D, uint64, P>(y));
-		vecType<D, uint64, P> Max32((static_cast<uint64>(1) << static_cast<uint64>(32)) - static_cast<uint64>(1));
-		Carry = mix(vecType<D, uint32, P>(0), vecType<D, uint32, P>(1), greaterThan(Value64, Max32));
-		return vecType<D, uint32,P>(Value64 % (Max32 + static_cast<uint64>(1)));
+		vecType<L, uint64, P> Value64(vecType<L, uint64, P>(x) + vecType<L, uint64, P>(y));
+		vecType<L, uint64, P> Max32((static_cast<uint64>(1) << static_cast<uint64>(32)) - static_cast<uint64>(1));
+		Carry = mix(vecType<L, uint32, P>(0), vecType<L, uint32, P>(1), greaterThan(Value64, Max32));
+		return vecType<L, uint32,P>(Value64 % (Max32 + static_cast<uint64>(1)));
 	}
 
 	// usubBorrow
@@ -207,12 +207,12 @@ namespace detail
 			return static_cast<uint32>((static_cast<int64>(1) << static_cast<int64>(32)) + (static_cast<int64>(y) - static_cast<int64>(x)));
 	}
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, uint, P> usubBorrow(vecType<D, uint, P> const & x, vecType<D, uint, P> const & y, vecType<D, uint, P> & Borrow)
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, uint, P> usubBorrow(vecType<L, uint, P> const& x, vecType<L, uint, P> const& y, vecType<L, uint, P>& Borrow)
 	{
-		Borrow = mix(vecType<D, uint, P>(1), vecType<D, uint, P>(0), greaterThanEqual(x, y));
-		vecType<D, uint, P> const YgeX(y - x);
-		vecType<D, uint, P> const XgeY(vecType<D, uint32, P>((static_cast<int64>(1) << static_cast<int64>(32)) + (vecType<D, int64, P>(y) - vecType<D, int64, P>(x))));
+		Borrow = mix(vecType<L, uint, P>(1), vecType<L, uint, P>(0), greaterThanEqual(x, y));
+		vecType<L, uint, P> const YgeX(y - x);
+		vecType<L, uint, P> const XgeY(vecType<L, uint32, P>((static_cast<int64>(1) << static_cast<int64>(32)) + (vecType<L, int64, P>(y) - vecType<L, int64, P>(x))));
 		return mix(XgeY, YgeX, greaterThanEqual(y, x));
 	}
 
@@ -226,18 +226,18 @@ namespace detail
 		lsb = static_cast<uint>(Value64);
 	}
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER void umulExtended(vecType<D, uint, P> const & x, vecType<D, uint, P> const & y, vecType<D, uint, P> & msb, vecType<D, uint, P> & lsb)
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER void umulExtended(vecType<L, uint, P> const& x, vecType<L, uint, P> const& y, vecType<L, uint, P>& msb, vecType<L, uint, P>& lsb)
 	{
 		GLM_STATIC_ASSERT(sizeof(uint) == sizeof(uint32), "uint and uint32 size mismatch");
 
-		vecType<D, uint64, P> Value64(vecType<D, uint64, P>(x) * vecType<D, uint64, P>(y));
-		msb = vecType<D, uint32, P>(Value64 >> static_cast<uint64>(32));
-		lsb = vecType<D, uint32, P>(Value64);
+		vecType<L, uint64, P> Value64(vecType<L, uint64, P>(x) * vecType<L, uint64, P>(y));
+		msb = vecType<L, uint32, P>(Value64 >> static_cast<uint64>(32));
+		lsb = vecType<L, uint32, P>(Value64);
 	}
 
 	// imulExtended
-	GLM_FUNC_QUALIFIER void imulExtended(int x, int y, int & msb, int & lsb)
+	GLM_FUNC_QUALIFIER void imulExtended(int x, int y, int& msb, int& lsb)
 	{
 		GLM_STATIC_ASSERT(sizeof(int) == sizeof(int32), "int and int32 size mismatch");
 
@@ -246,25 +246,25 @@ namespace detail
 		lsb = static_cast<int>(Value64);
 	}
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER void imulExtended(vecType<D, int, P> const & x, vecType<D, int, P> const & y, vecType<D, int, P> & msb, vecType<D, int, P> & lsb)
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER void imulExtended(vecType<L, int, P> const& x, vecType<L, int, P> const& y, vecType<L, int, P>& msb, vecType<L, int, P>& lsb)
 	{
 		GLM_STATIC_ASSERT(sizeof(int) == sizeof(int32), "int and int32 size mismatch");
 
-		vecType<D, int64, P> Value64(vecType<D, int64, P>(x) * vecType<D, int64, P>(y));
-		lsb = vecType<D, int32, P>(Value64 & static_cast<int64>(0xFFFFFFFF));
-		msb = vecType<D, int32, P>((Value64 >> static_cast<int64>(32)) & static_cast<int64>(0xFFFFFFFF));
+		vecType<L, int64, P> Value64(vecType<L, int64, P>(x) * vecType<L, int64, P>(y));
+		lsb = vecType<L, int32, P>(Value64 & static_cast<int64>(0xFFFFFFFF));
+		msb = vecType<L, int32, P>((Value64 >> static_cast<int64>(32)) & static_cast<int64>(0xFFFFFFFF));
 	}
 
 	// bitfieldExtract
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER genIUType bitfieldExtract(genIUType Value, int Offset, int Bits)
 	{
 		return bitfieldExtract(vec<1, genIUType>(Value), Offset, Bits).x;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> bitfieldExtract(vecType<D, T, P> const & Value, int Offset, int Bits)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> bitfieldExtract(vecType<L, T, P> const& Value, int Offset, int Bits)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitfieldExtract' only accept integer inputs");
 
@@ -272,14 +272,14 @@ namespace detail
 	}
 
 	// bitfieldInsert
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER genIUType bitfieldInsert(genIUType const & Base, genIUType const & Insert, int Offset, int Bits)
 	{
 		return bitfieldInsert(vec<1, genIUType>(Base), vec<1, genIUType>(Insert), Offset, Bits).x;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> bitfieldInsert(vecType<D, T, P> const & Base, vecType<D, T, P> const & Insert, int Offset, int Bits)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> bitfieldInsert(vecType<L, T, P> const& Base, vecType<L, T, P> const& Insert, int Offset, int Bits)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitfieldInsert' only accept integer values");
 
@@ -288,54 +288,54 @@ namespace detail
 	}
 
 	// bitfieldReverse
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType bitfieldReverse(genType x)
 	{
 		return bitfieldReverse(glm::vec<1, genType, glm::defaultp>(x)).x;
 	}
 
-	template <int D, typename T, glm::precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> bitfieldReverse(vecType<D, T, P> const & v)
+	template<length_t L, typename T, glm::precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> bitfieldReverse(vecType<L, T, P> const& v)
 	{
-		vecType<D, T, P> x(v);
-		x = detail::compute_bitfieldReverseStep<D, T, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>=  2>::call(x, T(0x5555555555555555ull), static_cast<T>( 1));
-		x = detail::compute_bitfieldReverseStep<D, T, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>=  4>::call(x, T(0x3333333333333333ull), static_cast<T>( 2));
-		x = detail::compute_bitfieldReverseStep<D, T, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>=  8>::call(x, T(0x0F0F0F0F0F0F0F0Full), static_cast<T>( 4));
-		x = detail::compute_bitfieldReverseStep<D, T, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>= 16>::call(x, T(0x00FF00FF00FF00FFull), static_cast<T>( 8));
-		x = detail::compute_bitfieldReverseStep<D, T, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>= 32>::call(x, T(0x0000FFFF0000FFFFull), static_cast<T>(16));
-		x = detail::compute_bitfieldReverseStep<D, T, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>= 64>::call(x, T(0x00000000FFFFFFFFull), static_cast<T>(32));
+		vecType<L, T, P> x(v);
+		x = detail::compute_bitfieldReverseStep<L, T, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>=  2>::call(x, T(0x5555555555555555ull), static_cast<T>( 1));
+		x = detail::compute_bitfieldReverseStep<L, T, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>=  4>::call(x, T(0x3333333333333333ull), static_cast<T>( 2));
+		x = detail::compute_bitfieldReverseStep<L, T, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>=  8>::call(x, T(0x0F0F0F0F0F0F0F0Full), static_cast<T>( 4));
+		x = detail::compute_bitfieldReverseStep<L, T, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>= 16>::call(x, T(0x00FF00FF00FF00FFull), static_cast<T>( 8));
+		x = detail::compute_bitfieldReverseStep<L, T, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>= 32>::call(x, T(0x0000FFFF0000FFFFull), static_cast<T>(16));
+		x = detail::compute_bitfieldReverseStep<L, T, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>= 64>::call(x, T(0x00000000FFFFFFFFull), static_cast<T>(32));
 		return x;
 	}
 
 	// bitCount
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER int bitCount(genType x)
 	{
 		return bitCount(glm::vec<1, genType, glm::defaultp>(x)).x;
 	}
 
-	template <int D, typename T, glm::precision P, template <int, typename, glm::precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, int, P> bitCount(vecType<D, T, P> const & v)
+	template<length_t L, typename T, glm::precision P, template<length_t, typename, glm::precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, int, P> bitCount(vecType<L, T, P> const& v)
 	{
 	#if GLM_COMPILER & GLM_COMPILER_VC
 	#pragma warning(push)
 	#pragma warning(disable : 4310) //cast truncates constant value
 	#endif
-		vecType<D, typename detail::make_unsigned<T>::type, P> x(*reinterpret_cast<vecType<D, typename detail::make_unsigned<T>::type, P> const *>(&v));
-		x = detail::compute_bitfieldBitCountStep<D, typename detail::make_unsigned<T>::type, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>=  2>::call(x, typename detail::make_unsigned<T>::type(0x5555555555555555ull), typename detail::make_unsigned<T>::type( 1));
-		x = detail::compute_bitfieldBitCountStep<D, typename detail::make_unsigned<T>::type, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>=  4>::call(x, typename detail::make_unsigned<T>::type(0x3333333333333333ull), typename detail::make_unsigned<T>::type( 2));
-		x = detail::compute_bitfieldBitCountStep<D, typename detail::make_unsigned<T>::type, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>=  8>::call(x, typename detail::make_unsigned<T>::type(0x0F0F0F0F0F0F0F0Full), typename detail::make_unsigned<T>::type( 4));
-		x = detail::compute_bitfieldBitCountStep<D, typename detail::make_unsigned<T>::type, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>= 16>::call(x, typename detail::make_unsigned<T>::type(0x00FF00FF00FF00FFull), typename detail::make_unsigned<T>::type( 8));
-		x = detail::compute_bitfieldBitCountStep<D, typename detail::make_unsigned<T>::type, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>= 32>::call(x, typename detail::make_unsigned<T>::type(0x0000FFFF0000FFFFull), typename detail::make_unsigned<T>::type(16));
-		x = detail::compute_bitfieldBitCountStep<D, typename detail::make_unsigned<T>::type, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>= 64>::call(x, typename detail::make_unsigned<T>::type(0x00000000FFFFFFFFull), typename detail::make_unsigned<T>::type(32));
-		return vecType<D, int, P>(x);
+		vecType<L, typename detail::make_unsigned<T>::type, P> x(*reinterpret_cast<vecType<L, typename detail::make_unsigned<T>::type, P> const *>(&v));
+		x = detail::compute_bitfieldBitCountStep<L, typename detail::make_unsigned<T>::type, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>=  2>::call(x, typename detail::make_unsigned<T>::type(0x5555555555555555ull), typename detail::make_unsigned<T>::type( 1));
+		x = detail::compute_bitfieldBitCountStep<L, typename detail::make_unsigned<T>::type, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>=  4>::call(x, typename detail::make_unsigned<T>::type(0x3333333333333333ull), typename detail::make_unsigned<T>::type( 2));
+		x = detail::compute_bitfieldBitCountStep<L, typename detail::make_unsigned<T>::type, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>=  8>::call(x, typename detail::make_unsigned<T>::type(0x0F0F0F0F0F0F0F0Full), typename detail::make_unsigned<T>::type( 4));
+		x = detail::compute_bitfieldBitCountStep<L, typename detail::make_unsigned<T>::type, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>= 16>::call(x, typename detail::make_unsigned<T>::type(0x00FF00FF00FF00FFull), typename detail::make_unsigned<T>::type( 8));
+		x = detail::compute_bitfieldBitCountStep<L, typename detail::make_unsigned<T>::type, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>= 32>::call(x, typename detail::make_unsigned<T>::type(0x0000FFFF0000FFFFull), typename detail::make_unsigned<T>::type(16));
+		x = detail::compute_bitfieldBitCountStep<L, typename detail::make_unsigned<T>::type, P, vecType, detail::is_aligned<P>::value, sizeof(T) * 8>= 64>::call(x, typename detail::make_unsigned<T>::type(0x00000000FFFFFFFFull), typename detail::make_unsigned<T>::type(32));
+		return vecType<L, int, P>(x);
 	#if GLM_COMPILER & GLM_COMPILER_VC
 	#pragma warning(pop)
 	#endif
 	}
 
 	// findLSB
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER int findLSB(genIUType Value)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'findLSB' only accept integer values");
@@ -343,29 +343,29 @@ namespace detail
 		return detail::compute_findLSB<genIUType, sizeof(genIUType) * 8>::call(Value);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, int, P> findLSB(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, int, P> findLSB(vecType<L, T, P> const& x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'findLSB' only accept integer values");
 
-		return detail::functor1<D, int, T, P>::call(findLSB, x);
+		return detail::functor1<L, int, T, P>::call(findLSB, x);
 	}
 
 	// findMSB
-	template <typename genIUType>
-	GLM_FUNC_QUALIFIER int findMSB(genIUType x)
+	template<typename genIUType>
+	GLM_FUNC_QUALIFIER int findMSB(genIUType v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'findMSB' only accept integer values");
 
-		return findMSB(vec<1, genIUType>(x)).x;
+		return findMSB(vec<1, genIUType>(v)).x;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, int, P> findMSB(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, int, P> findMSB(vecType<L, T, P> const& v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'findMSB' only accept integer values");
 
-		return detail::compute_findMSB_vec<D, T, P, vecType, sizeof(T) * 8>::call(x);
+		return detail::compute_findMSB_vec<L, T, P, vecType, sizeof(T) * 8>::call(v);
 	}
 }//namespace glm
 
diff --git a/glm/detail/func_integer_simd.inl b/glm/detail/func_integer_simd.inl
index 50065883..ddff75ba 100644
--- a/glm/detail/func_integer_simd.inl
+++ b/glm/detail/func_integer_simd.inl
@@ -8,7 +8,7 @@
 namespace glm{
 namespace detail
 {
-	template <glm::precision P>
+	template<glm::precision P>
 	struct compute_bitfieldReverseStep<4, uint32, P, vec, true, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, uint32, P> call(vec<4, uint32, P> const & v, uint32 Mask, uint32 Shift)
@@ -29,7 +29,7 @@ namespace detail
 		}
 	};
 
-	template <glm::precision P>
+	template<glm::precision P>
 	struct compute_bitfieldBitCountStep<4, uint32, P, vec, true, true>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, uint32, P> call(vec<4, uint32, P> const & v, uint32 Mask, uint32 Shift)
@@ -48,14 +48,14 @@ namespace detail
 }//namespace detail
 
 #	if GLM_ARCH & GLM_ARCH_AVX_BIT
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER int bitCount(uint32 x)
 	{
 		return _mm_popcnt_u32(x);
 	}
 
 #	if(GLM_MODEL == GLM_MODEL_64)
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER int bitCount(uint64 x)
 	{
 		return static_cast<int>(_mm_popcnt_u64(x));
diff --git a/glm/detail/func_matrix.hpp b/glm/detail/func_matrix.hpp
index e01e80e2..b47efbe4 100644
--- a/glm/detail/func_matrix.hpp
+++ b/glm/detail/func_matrix.hpp
@@ -34,55 +34,55 @@
 namespace glm{
 namespace detail
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct outerProduct_trait<2, 2, T, P, vec, vec>
 	{
 		typedef mat<2, 2, T, P> type;
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct outerProduct_trait<2, 3, T, P, vec, vec>
 	{
 		typedef mat<3, 2, T, P> type;
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct outerProduct_trait<2, 4, T, P, vec, vec>
 	{
 		typedef mat<4, 2, T, P> type;
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct outerProduct_trait<3, 2, T, P, vec, vec>
 	{
 		typedef mat<2, 3, T, P> type;
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct outerProduct_trait<3, 3, T, P, vec, vec>
 	{
 		typedef mat<3, 3, T, P> type;
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct outerProduct_trait<3, 4, T, P, vec, vec>
 	{
 		typedef mat<4, 3, T, P> type;
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct outerProduct_trait<4, 2, T, P, vec, vec>
 	{
 		typedef mat<2, 4, T, P> type;
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct outerProduct_trait<4, 3, T, P, vec, vec>
 	{
 		typedef mat<3, 4, T, P> type;
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct outerProduct_trait<4, 4, T, P, vec, vec>
 	{
 		typedef mat<4, 4, T, P> type;
@@ -100,7 +100,7 @@ namespace detail
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/matrixCompMult.xml">GLSL matrixCompMult man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6 Matrix Functions</a>
-	template <typename T, precision P, template <typename, precision> class matType>
+	template<typename T, precision P, template<typename, precision> class matType>
 	GLM_FUNC_DECL matType<T, P> matrixCompMult(matType<T, P> const & x, matType<T, P> const & y);
 
 	/// Treats the first parameter c as a column vector
@@ -111,7 +111,7 @@ namespace detail
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/outerProduct.xml">GLSL outerProduct man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6 Matrix Functions</a>
-	template <int DA, int DB, typename T, precision P, template <int, typename, precision> class vecTypeA, template <int, typename, precision> class vecTypeB>
+	template<int DA, int DB, typename T, precision P, template<length_t, typename, precision> class vecTypeA, template<length_t, typename, precision> class vecTypeB>
 	GLM_FUNC_DECL typename detail::outerProduct_trait<DA, DB, T, P, vecTypeA, vecTypeB>::type outerProduct(vecTypeA<DA, T, P> const & c, vecTypeB<DB, T, P> const & r);
 
 	/// Returns the transposed matrix of x
@@ -121,7 +121,7 @@ namespace detail
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/transpose.xml">GLSL transpose man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6 Matrix Functions</a>
 #	if((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC11))
-		template <typename T, precision P, template <typename, precision> class matType>
+		template<typename T, precision P, template<typename, precision> class matType>
 		GLM_FUNC_DECL typename matType<T, P>::transpose_type transpose(matType<T, P> const & x);
 #	endif
 	
@@ -131,7 +131,7 @@ namespace detail
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/determinant.xml">GLSL determinant man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6 Matrix Functions</a>	
-	template <typename T, precision P, template <typename, precision> class matType>
+	template<typename T, precision P, template<typename, precision> class matType>
 	GLM_FUNC_DECL T determinant(matType<T, P> const & m);
 
 	/// Return the inverse of a squared matrix.
@@ -140,7 +140,7 @@ namespace detail
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/inverse.xml">GLSL inverse man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6 Matrix Functions</a>	 
-	template <typename T, precision P, template <typename, precision> class matType>
+	template<typename T, precision P, template<typename, precision> class matType>
 	GLM_FUNC_DECL matType<T, P> inverse(matType<T, P> const & m);
 
 	/// @}
diff --git a/glm/detail/func_matrix.inl b/glm/detail/func_matrix.inl
index 4dc9a756..c8173b40 100644
--- a/glm/detail/func_matrix.inl
+++ b/glm/detail/func_matrix.inl
@@ -7,7 +7,7 @@
 namespace glm{
 namespace detail
 {
-	template <template <length_t, length_t, typename, precision> class matType, length_t C, length_t R, typename T, precision P, bool Aligned>
+	template<template<length_t, length_t, typename, precision> class matType, length_t C, length_t R, typename T, precision P, bool Aligned>
 	struct compute_matrixCompMult
 	{
 		GLM_FUNC_QUALIFIER static matType<C, R, T, P> call(matType<C, R, T, P> const& x, matType<C, R, T, P> const& y)
@@ -19,10 +19,10 @@ namespace detail
 		}
 	};
 
-	template <template <length_t, length_t, typename, precision> class matType, length_t C, length_t R, typename T, precision P, bool Aligned>
+	template<template<length_t, length_t, typename, precision> class matType, length_t C, length_t R, typename T, precision P, bool Aligned>
 	struct compute_transpose{};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_transpose<mat, 2, 2, T, P, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static mat<2, 2, T, P> call(mat<2, 2, T, P> const& m)
@@ -36,7 +36,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_transpose<mat, 2, 3, T, P, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static mat<3, 2, T, P> call(mat<2, 3, T, P> const& m)
@@ -52,7 +52,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_transpose<mat, 2, 4, T, P, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static mat<4, 2, T, P> call(mat<2, 4, T, P> const& m)
@@ -70,7 +70,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_transpose<mat, 3, 2, T, P, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static mat<2, 3, T, P> call(mat<3, 2, T, P> const& m)
@@ -86,7 +86,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_transpose<mat, 3, 3, T, P, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static mat<3, 3, T, P> call(mat<3, 3, T, P> const& m)
@@ -107,7 +107,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_transpose<mat, 3, 4, T, P, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static mat<4, 3, T, P> call(mat<3, 4, T, P> const& m)
@@ -129,7 +129,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_transpose<mat, 4, 2, T, P, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static mat<2, 4, T, P> call(mat<4, 2, T, P> const& m)
@@ -147,7 +147,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_transpose<mat, 4, 3, T, P, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static mat<3, 4, T, P> call(mat<4, 3, T, P> const& m)
@@ -169,7 +169,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_transpose<mat, 4, 4, T, P, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static mat<4, 4, T, P> call(mat<4, 4, T, P> const& m)
@@ -198,10 +198,10 @@ namespace detail
 		}
 	};
 
-	template <template <length_t, length_t, typename, precision> class matType, length_t C, length_t R, typename T, precision P, bool Aligned>
+	template<template<length_t, length_t, typename, precision> class matType, length_t C, length_t R, typename T, precision P, bool Aligned>
 	struct compute_determinant{};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_determinant<mat, 2, 2, T, P, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static T call(mat<2, 2, T, P> const& m)
@@ -210,7 +210,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_determinant<mat, 3, 3, T, P, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static T call(mat<3, 3, T, P> const& m)
@@ -222,7 +222,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_determinant<mat, 4, 4, T, P, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static T call(mat<4, 4, T, P> const& m)
@@ -246,10 +246,10 @@ namespace detail
 		}
 	};
 
-	template <template <length_t, length_t, typename, precision> class matType, length_t C, length_t R, typename T, precision P, bool Aligned>
+	template<template<length_t, length_t, typename, precision> class matType, length_t C, length_t R, typename T, precision P, bool Aligned>
 	struct compute_inverse{};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_inverse<mat, 2, 2, T, P, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static mat<2, 2, T, P> call(mat<2, 2, T, P> const& m)
@@ -268,7 +268,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_inverse<mat, 3, 3, T, P, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static mat<3, 3, T, P> call(mat<3, 3, T, P> const& m)
@@ -293,7 +293,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_inverse<mat, 4, 4, T, P, Aligned>
 	{
 		GLM_FUNC_QUALIFIER static mat<4, 4, T, P> call(mat<4, 4, T, P> const& m)
@@ -355,14 +355,14 @@ namespace detail
 	};
 }//namespace detail
 
-	template <length_t C, length_t R, typename T, precision P, template <length_t, length_t, typename, precision> class matType>
+	template<length_t C, length_t R, typename T, precision P, template<length_t, length_t, typename, precision> class matType>
 	GLM_FUNC_QUALIFIER matType<C, R, T, P> matrixCompMult(matType<C, R, T, P> const & x, matType<C, R, T, P> const & y)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'matrixCompMult' only accept floating-point inputs");
 		return detail::compute_matrixCompMult<matType, C, R, T, P, detail::is_aligned<P>::value>::call(x, y);
 	}
 
-	template<int DA, int DB, typename T, precision P, template <int, typename, precision> class vecTypeA, template <int, typename, precision> class vecTypeB>
+	template<int DA, int DB, typename T, precision P, template<length_t, typename, precision> class vecTypeA, template<length_t, typename, precision> class vecTypeB>
 	GLM_FUNC_QUALIFIER typename detail::outerProduct_trait<DA, DB, T, P, vecTypeA, vecTypeB>::type outerProduct(vecTypeA<DA, T, P> const & c, vecTypeB<DB, T, P> const & r)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'outerProduct' only accept floating-point inputs");
@@ -373,21 +373,21 @@ namespace detail
 		return m;
 	}
 
-	template <length_t C, length_t R, typename T, precision P, template <length_t C, length_t R, typename, precision> class matType>
+	template<length_t C, length_t R, typename T, precision P, template<length_t C, length_t R, typename, precision> class matType>
 	GLM_FUNC_QUALIFIER typename matType<C, R, T, P>::transpose_type transpose(matType<C, R, T, P> const & m)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'transpose' only accept floating-point inputs");
 		return detail::compute_transpose<matType, C, R, T, P, detail::is_aligned<P>::value>::call(m);
 	}
 
-	template <length_t C, length_t R, typename T, precision P, template <length_t C, length_t R, typename, precision> class matType>
+	template<length_t C, length_t R, typename T, precision P, template<length_t C, length_t R, typename, precision> class matType>
 	GLM_FUNC_QUALIFIER T determinant(matType<C, R, T, P> const & m)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'determinant' only accept floating-point inputs");
 		return detail::compute_determinant<matType, C, R, T, P, detail::is_aligned<P>::value>::call(m);
 	}
 
-	template <length_t C, length_t R, typename T, precision P, template <length_t C, length_t R, typename, precision> class matType>
+	template<length_t C, length_t R, typename T, precision P, template<length_t C, length_t R, typename, precision> class matType>
 	GLM_FUNC_QUALIFIER matType<C, R, T, P> inverse(matType<C, R, T, P> const & m)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'inverse' only accept floating-point inputs");
diff --git a/glm/detail/func_matrix_simd.inl b/glm/detail/func_matrix_simd.inl
index 3c910e08..ba95a0ec 100644
--- a/glm/detail/func_matrix_simd.inl
+++ b/glm/detail/func_matrix_simd.inl
@@ -10,7 +10,7 @@
 namespace glm{
 namespace detail
 {
-	template <precision P>
+	template<precision P>
 	struct compute_matrixCompMult<mat<4, 4, float, P, true>
 	{
 		GLM_STATIC_ASSERT(detail::is_aligned<P>::value, "Specialization requires aligned");
@@ -26,7 +26,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_transpose<mat<4, 4, float, P, true>
 	{
 		GLM_FUNC_QUALIFIER static mat<4, 4, float, P> call(mat<4, 4, float, P> const & m)
@@ -39,7 +39,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_determinant<mat<4, 4, float, P, true>
 	{
 		GLM_FUNC_QUALIFIER static float call(mat<4, 4, float, P> const& m)
@@ -48,7 +48,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_inverse<mat<4, 4, float, P, true>
 	{
 		GLM_FUNC_QUALIFIER static mat<4, 4, float, P> call(mat<4, 4, float, P> const& m)
diff --git a/glm/detail/func_trigonometric.hpp b/glm/detail/func_trigonometric.hpp
index 052b0e02..f17ba6d1 100644
--- a/glm/detail/func_trigonometric.hpp
+++ b/glm/detail/func_trigonometric.hpp
@@ -28,8 +28,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/radians.xml">GLSL radians man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL GLM_CONSTEXPR vecType<D, T, P> radians(vecType<D, T, P> const & degrees);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL GLM_CONSTEXPR vecType<L, T, P> radians(vecType<L, T, P> const & degrees);
 
 	/// Converts radians to degrees and returns the result.
 	///
@@ -37,8 +37,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/degrees.xml">GLSL degrees man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL GLM_CONSTEXPR vecType<D, T, P> degrees(vecType<D, T, P> const & radians);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL GLM_CONSTEXPR vecType<L, T, P> degrees(vecType<L, T, P> const & radians);
 
 	/// The standard trigonometric sine function. 
 	/// The values returned by this function will range from [-1, 1].
@@ -47,8 +47,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sin.xml">GLSL sin man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> sin(vecType<D, T, P> const & angle);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> sin(vecType<L, T, P> const & angle);
 
 	/// The standard trigonometric cosine function. 
 	/// The values returned by this function will range from [-1, 1].
@@ -57,8 +57,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/cos.xml">GLSL cos man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> cos(vecType<D, T, P> const & angle);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> cos(vecType<L, T, P> const & angle);
 
 	/// The standard trigonometric tangent function.
 	///
@@ -66,8 +66,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/tan.xml">GLSL tan man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> tan(vecType<D, T, P> const & angle);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> tan(vecType<L, T, P> const & angle);
 
 	/// Arc sine. Returns an angle whose sine is x. 
 	/// The range of values returned by this function is [-PI/2, PI/2]. 
@@ -77,8 +77,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/asin.xml">GLSL asin man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> asin(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> asin(vecType<L, T, P> const & x);
 
 	/// Arc cosine. Returns an angle whose sine is x. 
 	/// The range of values returned by this function is [0, PI]. 
@@ -88,8 +88,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/acos.xml">GLSL acos man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> acos(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> acos(vecType<L, T, P> const & x);
 
 	/// Arc tangent. Returns an angle whose tangent is y/x. 
 	/// The signs of x and y are used to determine what 
@@ -101,8 +101,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/atan.xml">GLSL atan man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> atan(vecType<D, T, P> const & y, vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> atan(vecType<L, T, P> const & y, vecType<L, T, P> const & x);
 
 	/// Arc tangent. Returns an angle whose tangent is y_over_x. 
 	/// The range of values returned by this function is [-PI/2, PI/2].
@@ -111,8 +111,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/atan.xml">GLSL atan man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> atan(vecType<D, T, P> const & y_over_x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> atan(vecType<L, T, P> const & y_over_x);
 
 	/// Returns the hyperbolic sine function, (exp(x) - exp(-x)) / 2
 	///
@@ -120,8 +120,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sinh.xml">GLSL sinh man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> sinh(vecType<D, T, P> const & angle);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> sinh(vecType<L, T, P> const & angle);
 
 	/// Returns the hyperbolic cosine function, (exp(x) + exp(-x)) / 2
 	///
@@ -129,8 +129,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/cosh.xml">GLSL cosh man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> cosh(vecType<D, T, P> const & angle);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> cosh(vecType<L, T, P> const & angle);
 
 	/// Returns the hyperbolic tangent function, sinh(angle) / cosh(angle)
 	///
@@ -138,8 +138,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/tanh.xml">GLSL tanh man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> tanh(vecType<D, T, P> const & angle);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> tanh(vecType<L, T, P> const & angle);
 
 	/// Arc hyperbolic sine; returns the inverse of sinh.
 	///
@@ -147,8 +147,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/asinh.xml">GLSL asinh man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> asinh(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> asinh(vecType<L, T, P> const & x);
 	
 	/// Arc hyperbolic cosine; returns the non-negative inverse
 	/// of cosh. Results are undefined if x < 1.
@@ -157,8 +157,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/acosh.xml">GLSL acosh man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> acosh(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> acosh(vecType<L, T, P> const & x);
 
 	/// Arc hyperbolic tangent; returns the inverse of tanh.
 	/// Results are undefined if abs(x) >= 1.
@@ -167,8 +167,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/atanh.xml">GLSL atanh man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> atanh(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> atanh(vecType<L, T, P> const & x);
 
 	/// @}
 }//namespace glm
diff --git a/glm/detail/func_trigonometric.inl b/glm/detail/func_trigonometric.inl
index 0e191cf7..952273dc 100644
--- a/glm/detail/func_trigonometric.inl
+++ b/glm/detail/func_trigonometric.inl
@@ -8,7 +8,7 @@
 namespace glm
 {
 	// radians
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType radians(genType degrees)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'radians' only accept floating-point input");
@@ -16,14 +16,14 @@ namespace glm
 		return degrees * static_cast<genType>(0.01745329251994329576923690768489);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vecType<D, T, P> radians(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vecType<L, T, P> radians(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(radians, v);
+		return detail::functor1<L, T, T, P>::call(radians, v);
 	}
 	
 	// degrees
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType degrees(genType radians)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'degrees' only accept floating-point input");
@@ -31,59 +31,59 @@ namespace glm
 		return radians * static_cast<genType>(57.295779513082320876798154814105);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vecType<D, T, P> degrees(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vecType<L, T, P> degrees(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(degrees, v);
+		return detail::functor1<L, T, T, P>::call(degrees, v);
 	}
 
 	// sin
 	using ::std::sin;
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> sin(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> sin(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(sin, v);
+		return detail::functor1<L, T, T, P>::call(sin, v);
 	}
 
 	// cos
 	using std::cos;
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> cos(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> cos(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(cos, v);
+		return detail::functor1<L, T, T, P>::call(cos, v);
 	}
 
 	// tan
 	using std::tan;
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> tan(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> tan(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(tan, v);
+		return detail::functor1<L, T, T, P>::call(tan, v);
 	}
 
 	// asin
 	using std::asin;
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> asin(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> asin(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(asin, v);
+		return detail::functor1<L, T, T, P>::call(asin, v);
 	}
 
 	// acos
 	using std::acos;
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> acos(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> acos(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(acos, v);
+		return detail::functor1<L, T, T, P>::call(acos, v);
 	}
 
 	// atan
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType atan(genType y, genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'atan' only accept floating-point input");
@@ -91,52 +91,52 @@ namespace glm
 		return ::std::atan2(y, x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> atan(vecType<D, T, P> const & a, vecType<D, T, P> const & b)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> atan(vecType<L, T, P> const & a, vecType<L, T, P> const & b)
 	{
-		return detail::functor2<D, T, P>::call(::std::atan2, a, b);
+		return detail::functor2<L, T, P>::call(::std::atan2, a, b);
 	}
 
 	using std::atan;
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> atan(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> atan(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(atan, v);
+		return detail::functor1<L, T, T, P>::call(atan, v);
 	}
 
 	// sinh
 	using std::sinh;
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> sinh(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> sinh(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(sinh, v);
+		return detail::functor1<L, T, T, P>::call(sinh, v);
 	}
 
 	// cosh
 	using std::cosh;
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> cosh(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> cosh(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(cosh, v);
+		return detail::functor1<L, T, T, P>::call(cosh, v);
 	}
 
 	// tanh
 	using std::tanh;
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> tanh(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> tanh(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(tanh, v);
+		return detail::functor1<L, T, T, P>::call(tanh, v);
 	}
 
 	// asinh
 #	if GLM_HAS_CXX11_STL
 		using std::asinh;
 #	else
-		template <typename genType>
+		template<typename genType>
 		GLM_FUNC_QUALIFIER genType asinh(genType x)
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'asinh' only accept floating-point input");
@@ -145,17 +145,17 @@ namespace glm
 		}
 #	endif
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> asinh(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> asinh(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(asinh, v);
+		return detail::functor1<L, T, T, P>::call(asinh, v);
 	}
 
 	// acosh
 #	if GLM_HAS_CXX11_STL
 		using std::acosh;
 #	else
-		template <typename genType> 
+		template<typename genType> 
 		GLM_FUNC_QUALIFIER genType acosh(genType x)
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'acosh' only accept floating-point input");
@@ -166,17 +166,17 @@ namespace glm
 		}
 #	endif
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> acosh(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> acosh(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(acosh, v);
+		return detail::functor1<L, T, T, P>::call(acosh, v);
 	}
 
 	// atanh
 #	if GLM_HAS_CXX11_STL
 		using std::atanh;
 #	else
-		template <typename genType>
+		template<typename genType>
 		GLM_FUNC_QUALIFIER genType atanh(genType x)
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'atanh' only accept floating-point input");
@@ -187,10 +187,10 @@ namespace glm
 		}
 #	endif
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> atanh(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> atanh(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(atanh, v);
+		return detail::functor1<L, T, T, P>::call(atanh, v);
 	}
 }//namespace glm
 
diff --git a/glm/detail/func_vector_relational.hpp b/glm/detail/func_vector_relational.hpp
index 93a4545b..f981bd7f 100644
--- a/glm/detail/func_vector_relational.hpp
+++ b/glm/detail/func_vector_relational.hpp
@@ -29,8 +29,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/lessThan.xml">GLSL lessThan man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, bool, P> lessThan(vecType<D, T, P> const & x, vecType<D, T, P> const & y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, bool, P> lessThan(vecType<L, T, P> const & x, vecType<L, T, P> const & y);
 
 	/// Returns the component-wise comparison of result x <= y.
 	///
@@ -38,8 +38,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/lessThanEqual.xml">GLSL lessThanEqual man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, bool, P> lessThanEqual(vecType<D, T, P> const & x, vecType<D, T, P> const & y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, bool, P> lessThanEqual(vecType<L, T, P> const & x, vecType<L, T, P> const & y);
 
 	/// Returns the component-wise comparison of result x > y.
 	///
@@ -47,8 +47,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/greaterThan.xml">GLSL greaterThan man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, bool, P> greaterThan(vecType<D, T, P> const & x, vecType<D, T, P> const & y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, bool, P> greaterThan(vecType<L, T, P> const & x, vecType<L, T, P> const & y);
 
 	/// Returns the component-wise comparison of result x >= y.
 	///
@@ -56,8 +56,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/greaterThanEqual.xml">GLSL greaterThanEqual man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, bool, P> greaterThanEqual(vecType<D, T, P> const & x, vecType<D, T, P> const & y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, bool, P> greaterThanEqual(vecType<L, T, P> const & x, vecType<L, T, P> const & y);
 
 	/// Returns the component-wise comparison of result x == y.
 	///
@@ -65,8 +65,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/equal.xml">GLSL equal man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, bool, P> equal(vecType<D, T, P> const & x, vecType<D, T, P> const & y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, bool, P> equal(vecType<L, T, P> const & x, vecType<L, T, P> const & y);
 
 	/// Returns the component-wise comparison of result x != y.
 	/// 
@@ -74,8 +74,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/notEqual.xml">GLSL notEqual man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, bool, P> notEqual(vecType<D, T, P> const & x, vecType<D, T, P> const & y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, bool, P> notEqual(vecType<L, T, P> const & x, vecType<L, T, P> const & y);
 
 	/// Returns true if any component of x is true.
 	///
@@ -83,8 +83,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/any.xml">GLSL any man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL bool any(vecType<D, bool, P> const & v);
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL bool any(vecType<L, bool, P> const & v);
 
 	/// Returns true if all components of x are true.
 	///
@@ -92,8 +92,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/all.xml">GLSL all man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL bool all(vecType<D, bool, P> const & v);
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL bool all(vecType<L, bool, P> const & v);
 
 	/// Returns the component-wise logical complement of x.
 	/// /!\ Because of language incompatibilities between C++ and GLSL, GLM defines the function not but not_ instead.
@@ -102,8 +102,8 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/not.xml">GLSL not man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.7 Vector Relational Functions</a>
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, bool, P> not_(vecType<D, bool, P> const & v);
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, bool, P> not_(vecType<L, bool, P> const & v);
 
 	/// @}
 }//namespace glm
diff --git a/glm/detail/func_vector_relational.inl b/glm/detail/func_vector_relational.inl
index 8ea81c20..88ab56da 100644
--- a/glm/detail/func_vector_relational.inl
+++ b/glm/detail/func_vector_relational.inl
@@ -5,75 +5,75 @@
 
 namespace glm
 {
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> lessThan(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> lessThan(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 	{
 		assert(x.length() == y.length());
 
-		vecType<D, bool, P> Result(uninitialize);
+		vecType<L, bool, P> Result(uninitialize);
 		for(length_t i = 0; i < x.length(); ++i)
 			Result[i] = x[i] < y[i];
 
 		return Result;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> lessThanEqual(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> lessThanEqual(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 	{
 		assert(x.length() == y.length());
 
-		vecType<D, bool, P> Result(uninitialize);
+		vecType<L, bool, P> Result(uninitialize);
 		for(length_t i = 0; i < x.length(); ++i)
 			Result[i] = x[i] <= y[i];
 		return Result;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> greaterThan(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> greaterThan(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 	{
 		assert(x.length() == y.length());
 
-		vecType<D, bool, P> Result(uninitialize);
+		vecType<L, bool, P> Result(uninitialize);
 		for(length_t i = 0; i < x.length(); ++i)
 			Result[i] = x[i] > y[i];
 		return Result;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> greaterThanEqual(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> greaterThanEqual(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 	{
 		assert(x.length() == y.length());
 
-		vecType<D, bool, P> Result(uninitialize);
+		vecType<L, bool, P> Result(uninitialize);
 		for(length_t i = 0; i < x.length(); ++i)
 			Result[i] = x[i] >= y[i];
 		return Result;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> equal(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> equal(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 	{
 		assert(x.length() == y.length());
 
-		vecType<D, bool, P> Result(uninitialize);
+		vecType<L, bool, P> Result(uninitialize);
 		for(length_t i = 0; i < x.length(); ++i)
 			Result[i] = x[i] == y[i];
 		return Result;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> notEqual(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> notEqual(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 	{
 		assert(x.length() == y.length());
 
-		vecType<D, bool, P> Result(uninitialize);
+		vecType<L, bool, P> Result(uninitialize);
 		for(length_t i = 0; i < x.length(); ++i)
 			Result[i] = x[i] != y[i];
 		return Result;
 	}
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER bool any(vecType<D, bool, P> const & v)
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER bool any(vecType<L, bool, P> const & v)
 	{
 		bool Result = false;
 		for(length_t i = 0; i < v.length(); ++i)
@@ -81,8 +81,8 @@ namespace glm
 		return Result;
 	}
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER bool all(vecType<D, bool, P> const & v)
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER bool all(vecType<L, bool, P> const & v)
 	{
 		bool Result = true;
 		for(length_t i = 0; i < v.length(); ++i)
@@ -90,10 +90,10 @@ namespace glm
 		return Result;
 	}
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> not_(vecType<D, bool, P> const & v)
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> not_(vecType<L, bool, P> const & v)
 	{
-		vecType<D, bool, P> Result(uninitialize);
+		vecType<L, bool, P> Result(uninitialize);
 		for(length_t i = 0; i < v.length(); ++i)
 			Result[i] = !v[i];
 		return Result;
diff --git a/glm/detail/precision.hpp b/glm/detail/precision.hpp
index 1089d118..86774b26 100644
--- a/glm/detail/precision.hpp
+++ b/glm/detail/precision.hpp
@@ -32,12 +32,12 @@ namespace glm
 #		endif
 	};
 
-	template <length_t L, typename T, precision P = defaultp> struct vec;
-	template <length_t C, length_t R, typename T, precision P = defaultp> struct mat;
+	template<length_t L, typename T, precision P = defaultp> struct vec;
+	template<length_t C, length_t R, typename T, precision P = defaultp> struct mat;
 
 namespace detail
 {
-	template <glm::precision P>
+	template<glm::precision P>
 	struct is_aligned
 	{
 		static const bool value = false;
diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
index 1a22383f..31b1b35b 100644
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@@ -777,7 +777,7 @@ namespace glm
 #if GLM_HAS_CONSTEXPR_PARTIAL
 	namespace glm
 	{
-		template <typename T, std::size_t N>
+		template<typename T, std::size_t N>
 		constexpr std::size_t countof(T const (&)[N])
 		{
 			return N;
diff --git a/glm/detail/type_gentype.hpp b/glm/detail/type_gentype.hpp
index 8fd202e2..ac9fc019 100644
--- a/glm/detail/type_gentype.hpp
+++ b/glm/detail/type_gentype.hpp
@@ -19,7 +19,7 @@ namespace detail
 	template
 	<
 		typename VALTYPE, 
-		template <typename> class TYPE
+		template<typename> class TYPE
 	>
 	struct genType
 	{
@@ -65,14 +65,14 @@ namespace detail
 	template
 	<
 		typename VALTYPE, 
-		template <typename> class TYPE
+		template<typename> class TYPE
 	>
 	bool genType<VALTYPE, TYPE>::is_vector()
 	{
 		return true;
 	}
 /*
-	template <typename valTypeT, unsigned int colT, unsigned int rowT, profile proT = nice>
+	template<typename valTypeT, unsigned int colT, unsigned int rowT, profile proT = nice>
 	class base
 	{
 	public:
@@ -112,7 +112,7 @@ namespace detail
 
 		//////////////////////////////////////
 		// Conversions
-		template <typename vU, uint cU, uint rU, profile pU>
+		template<typename vU, uint cU, uint rU, profile pU>
 		explicit base(base<vU, cU, rU, pU> const & m);
 
 		//////////////////////////////////////
@@ -136,7 +136,7 @@ namespace detail
 	};
 */
 	
-	//template <typename T>
+	//template<typename T>
 	//struct traits
 	//{
 	//	static const bool is_signed = false;
@@ -148,28 +148,28 @@ namespace detail
 	//	static const bool is_genUType = false;
 	//};
 	
-	//template <>
+	//template<>
 	//struct traits<half>
 	//{
 	//	static const bool is_float = true;
 	//	static const bool is_genType = true;
 	//};
 	
-	//template <>
+	//template<>
 	//struct traits<float>
 	//{
 	//	static const bool is_float = true;
 	//	static const bool is_genType = true;
 	//};
 	
-	//template <>
+	//template<>
 	//struct traits<double>
 	//{
 	//	static const bool is_float = true;
 	//	static const bool is_genType = true;
 	//};
 	
-	//template <typename genType>
+	//template<typename genType>
 	//struct desc
 	//{
 	//	typedef genType							type;
@@ -186,7 +186,7 @@ namespace detail
 	//	static const typename size_type			value_size;
 	//};
 	
-	//template <typename genType>
+	//template<typename genType>
 	//const typename desc<genType>::size_type desc<genType>::value_size = genType::value_size();
 	
 }//namespace detail
diff --git a/glm/detail/type_gentype.inl b/glm/detail/type_gentype.inl
index 6a90288e..384f725f 100644
--- a/glm/detail/type_gentype.inl
+++ b/glm/detail/type_gentype.inl
@@ -7,37 +7,37 @@ namespace detail{
 /////////////////////////////////
 // Static functions
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 typename base<vT, cT, rT, pT>::size_type base<vT, cT, rT, pT>::col_size()
 {
 	return cT;
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 typename base<vT, cT, rT, pT>::size_type base<vT, cT, rT, pT>::row_size()
 {
 	return rT;
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 typename base<vT, cT, rT, pT>::size_type base<vT, cT, rT, pT>::value_size()
 {
 	return rT * cT;
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 bool base<vT, cT, rT, pT>::is_scalar()
 {
 	return rT == 1 && cT == 1;
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 bool base<vT, cT, rT, pT>::is_vector()
 {
 	return rT == 1;
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 bool base<vT, cT, rT, pT>::is_matrix()
 {
 	return rT != 1;
@@ -46,13 +46,13 @@ bool base<vT, cT, rT, pT>::is_matrix()
 /////////////////////////////////
 // Constructor
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 base<vT, cT, rT, pT>::base()
 {
 	memset(&this->value, 0, cT * rT * sizeof(vT));
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 base<vT, cT, rT, pT>::base
 (
 	typename base<vT, cT, rT, pT>::class_type const & m
@@ -69,7 +69,7 @@ base<vT, cT, rT, pT>::base
 	}
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 base<vT, cT, rT, pT>::base
 (
 	typename base<vT, cT, rT, pT>::T const & x
@@ -105,7 +105,7 @@ base<vT, cT, rT, pT>::base
 	}
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 base<vT, cT, rT, pT>::base
 (
 	typename base<vT, cT, rT, pT>::value_type const * const x
@@ -114,7 +114,7 @@ base<vT, cT, rT, pT>::base
 	memcpy(&this->value, &x.value, cT * rT * sizeof(vT));
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 base<vT, cT, rT, pT>::base
 (
 	typename base<vT, cT, rT, pT>::col_type const * const x
@@ -131,8 +131,8 @@ base<vT, cT, rT, pT>::base
 	}
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
-template <typename vU, uint cU, uint rU, profile pU>
+template<typename vT, uint cT, uint rT, profile pT>
+template<typename vU, uint cU, uint rU, profile pU>
 base<vT, cT, rT, pT>::base
 (
 	base<vU, cU, rU, pU> const & m
@@ -152,7 +152,7 @@ base<vT, cT, rT, pT>::base
 //////////////////////////////////////
 // Accesses
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 typename base<vT, cT, rT, pT>::col_type& base<vT, cT, rT, pT>::operator[]
 (
 	typename base<vT, cT, rT, pT>::size_type i
@@ -161,7 +161,7 @@ typename base<vT, cT, rT, pT>::col_type& base<vT, cT, rT, pT>::operator[]
 	return this->value[i];
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 typename base<vT, cT, rT, pT>::col_type const & base<vT, cT, rT, pT>::operator[]
 (
 	typename base<vT, cT, rT, pT>::size_type i
@@ -173,7 +173,7 @@ typename base<vT, cT, rT, pT>::col_type const & base<vT, cT, rT, pT>::operator[]
 //////////////////////////////////////
 // Unary updatable operators
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator= 
 (
 	typename base<vT, cT, rT, pT>::class_type const & x
@@ -183,7 +183,7 @@ typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator=
 	return *this;
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator+= 
 (
 	typename base<vT, cT, rT, pT>::T const & x
@@ -199,7 +199,7 @@ typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator+=
 	return *this;
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator+= 
 (
 	typename base<vT, cT, rT, pT>::class_type const & x
@@ -215,7 +215,7 @@ typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator+=
 	return *this;
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator-= 
 (
 	typename base<vT, cT, rT, pT>::T const & x
@@ -231,7 +231,7 @@ typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator-=
 	return *this;
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator-= 
 (
 	typename base<vT, cT, rT, pT>::class_type const & x
@@ -247,7 +247,7 @@ typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator-=
 	return *this;
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator*= 
 (
 	typename base<vT, cT, rT, pT>::T const & x
@@ -263,7 +263,7 @@ typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator*=
 	return *this;
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator*= 
 (
 	typename base<vT, cT, rT, pT>::class_type const & x
@@ -279,7 +279,7 @@ typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator*=
 	return *this;
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator/= 
 (
 	typename base<vT, cT, rT, pT>::T const & x
@@ -295,7 +295,7 @@ typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator/=
 	return *this;
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator/= 
 (
 	typename base<vT, cT, rT, pT>::class_type const & x
@@ -311,7 +311,7 @@ typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator/=
 	return *this;
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator++ ()
 {
 	typename base<vT, cT, rT, pT>::size_type stop_col = col_size();
@@ -324,7 +324,7 @@ typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator++ ()
 	return *this;
 }
 
-template <typename vT, uint cT, uint rT, profile pT>
+template<typename vT, uint cT, uint rT, profile pT>
 typename base<vT, cT, rT, pT>::class_type& base<vT, cT, rT, pT>::operator-- ()
 {
 	typename base<vT, cT, rT, pT>::size_type stop_col = col_size();
diff --git a/glm/detail/type_int.hpp b/glm/detail/type_int.hpp
index 764a32cf..36feb16a 100644
--- a/glm/detail/type_int.hpp
+++ b/glm/detail/type_int.hpp
@@ -73,129 +73,129 @@ namespace detail
 		using std::make_unsigned;
 
 #	else//GLM_HAS_MAKE_SIGNED
-		template <typename genType>
+		template<typename genType>
 		struct make_signed
 		{};
 
-		template <>
+		template<>
 		struct make_signed<char>
 		{
 			typedef char type;
 		};
 
-		template <>
+		template<>
 		struct make_signed<short>
 		{
 			typedef short type;
 		};
 
-		template <>
+		template<>
 		struct make_signed<int>
 		{
 			typedef int type;
 		};
 
-		template <>
+		template<>
 		struct make_signed<long>
 		{
 			typedef long type;
 		};
 	
-		template <>
+		template<>
 		struct make_signed<unsigned char>
 		{
 			typedef char type;
 		};
 
-		template <>
+		template<>
 		struct make_signed<unsigned short>
 		{
 			typedef short type;
 		};
 
-		template <>
+		template<>
 		struct make_signed<unsigned int>
 		{
 			typedef int type;
 		};
 
-		template <>
+		template<>
 		struct make_signed<unsigned long>
 		{
 			typedef long type;
 		};
 
-		template <typename genType>
+		template<typename genType>
 		struct make_unsigned
 		{};
 
-		template <>
+		template<>
 		struct make_unsigned<char>
 		{
 			typedef unsigned char type;
 		};
 
-		template <>
+		template<>
 		struct make_unsigned<short>
 		{
 			typedef unsigned short type;
 		};
 
-		template <>
+		template<>
 		struct make_unsigned<int>
 		{
 			typedef unsigned int type;
 		};
 
-		template <>
+		template<>
 		struct make_unsigned<long>
 		{
 			typedef unsigned long type;
 		};
 
-		template <>
+		template<>
 		struct make_unsigned<unsigned char>
 		{
 			typedef unsigned char type;
 		};
 
-		template <>
+		template<>
 		struct make_unsigned<unsigned short>
 		{
 			typedef unsigned short type;
 		};
 
-		template <>
+		template<>
 		struct make_unsigned<unsigned int>
 		{
 			typedef unsigned int type;
 		};
 
-		template <>
+		template<>
 		struct make_unsigned<unsigned long>
 		{
 			typedef unsigned long type;
 		};
 
-		template <>
+		template<>
 		struct make_signed<long long>
 		{
 			typedef long long type;
 		};
 	
-		template <>
+		template<>
 		struct make_signed<unsigned long long>
 		{
 			typedef long long type;
 		};
 	
-		template <>
+		template<>
 		struct make_unsigned<long long>
 		{
 			typedef unsigned long long type;
 		};
 	
-		template <>
+		template<>
 		struct make_unsigned<unsigned long long>
 		{
 			typedef unsigned long long type;
diff --git a/glm/detail/type_mat.hpp b/glm/detail/type_mat.hpp
index 763358e6..677ce605 100644
--- a/glm/detail/type_mat.hpp
+++ b/glm/detail/type_mat.hpp
@@ -8,11 +8,11 @@
 namespace glm{
 namespace detail
 {
-	template <int Columns, int Rows, typename T, precision P, template <int, class, precision> class colType, template <int, class, precision> class rowType>
+	template<int Columns, int Rows, typename T, precision P, template<int, class, precision> class colType, template<int, class, precision> class rowType>
 	struct outerProduct_trait{};
 }//namespace detail
 
-	template <typename T, precision P, template <typename, precision> class matType>
+	template<typename T, precision P, template<typename, precision> class matType>
 	GLM_FUNC_DECL matType<T, P> inverse(matType<T, P> const & m);
 
 	/// @addtogroup core_precision
diff --git a/glm/detail/type_mat2x2.hpp b/glm/detail/type_mat2x2.hpp
index 3d8f3ae0..4d86b72a 100644
--- a/glm/detail/type_mat2x2.hpp
+++ b/glm/detail/type_mat2x2.hpp
@@ -11,7 +11,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct mat<2, 2, T, P>
 	{
 		typedef vec<2, T, P> col_type;
@@ -28,7 +28,7 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT_CTOR;
 		GLM_FUNC_DECL mat(mat<2, 2, T, P> const & m) GLM_DEFAULT;
-		template <precision Q>
+		template<precision Q>
 		GLM_FUNC_DECL mat(mat<2, 2, T, Q> const & m);
 
 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit mat(ctor);
@@ -42,19 +42,19 @@ namespace glm
 
 		// -- Conversions --
 
-		template <typename U, typename V, typename M, typename N>
+		template<typename U, typename V, typename M, typename N>
 		GLM_FUNC_DECL mat(
 			U const & x1, V const & y1,
 			M const & x2, N const & y2);
 
-		template <typename U, typename V>
+		template<typename U, typename V>
 		GLM_FUNC_DECL mat(
 			vec<2, U, P> const & v1,
 			vec<2, V, P> const & v2);
 
 		// -- Matrix conversions --
 
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, U, Q> const & m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 3, T, P> const & x);
@@ -78,23 +78,23 @@ namespace glm
 
 		GLM_FUNC_DECL mat<2, 2, T, P> & operator=(mat<2, 2, T, P> const & v) GLM_DEFAULT;
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 2, T, P> & operator=(mat<2, 2, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 2, T, P> & operator+=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 2, T, P> & operator+=(mat<2, 2, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 2, T, P> & operator-=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 2, T, P> & operator-=(mat<2, 2, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 2, T, P> & operator*=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 2, T, P> & operator*=(mat<2, 2, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 2, T, P> & operator/=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 2, T, P> & operator/=(mat<2, 2, U, P> const & m);
 
 		// -- Increment and decrement operators --
@@ -107,74 +107,74 @@ namespace glm
 
 	// -- Unary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> operator+(mat<2, 2, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> operator-(mat<2, 2, T, P> const & m);
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> operator+(mat<2, 2, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> operator+(T scalar, mat<2, 2, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> operator+(mat<2, 2, T, P> const & m1, mat<2, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> operator-(mat<2, 2, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> operator-(T scalar, mat<2, 2, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> operator-(mat<2, 2, T, P> const & m1, mat<2, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> operator*(mat<2, 2, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> operator*(T scalar, mat<2, 2, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<2, 2, T, P>::col_type operator*(mat<2, 2, T, P> const & m, typename mat<2, 2, T, P>::row_type const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<2, 2, T, P>::row_type operator*(typename mat<2, 2, T, P>::col_type const & v, mat<2, 2, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> operator*(mat<2, 2, T, P> const & m1, mat<2, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 2, T, P> operator*(mat<2, 2, T, P> const & m1, mat<3, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 2, T, P> operator*(mat<2, 2, T, P> const & m1, mat<4, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> operator/(mat<2, 2, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> operator/(T scalar, mat<2, 2, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<2, 2, T, P>::col_type operator/(mat<2, 2, T, P> const & m, typename mat<2, 2, T, P>::row_type const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<2, 2, T, P>::row_type operator/(typename mat<2, 2, T, P>::col_type const & v, mat<2, 2, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> operator/(mat<2, 2, T, P> const & m1, mat<2, 2, T, P> const & m2);
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator==(mat<2, 2, T, P> const & m1, mat<2, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator!=(mat<2, 2, T, P> const & m1, mat<2, 2, T, P> const & m2);
 } //namespace glm
 
diff --git a/glm/detail/type_mat2x2.inl b/glm/detail/type_mat2x2.inl
index 09b1d1a5..cfd7a868 100644
--- a/glm/detail/type_mat2x2.inl
+++ b/glm/detail/type_mat2x2.inl
@@ -8,7 +8,7 @@ namespace glm
 	// -- Constructors --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat()
 		{
 #			ifndef GLM_FORCE_NO_CTOR_INIT 
@@ -19,7 +19,7 @@ namespace glm
 #	endif
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat(mat<2, 2, T, P> const& m)
 		{
 			this->value[0] = m.value[0];
@@ -27,26 +27,26 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <precision Q>
+	template<typename T, precision P>
+	template<precision Q>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat(mat<2, 2, T, Q> const& m)
 	{
 		this->value[0] = m.value[0];
 		this->value[1] = m.value[1];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR mat<2, 2, T, P>::mat(ctor)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat(T scalar)
 	{
 		this->value[0] = col_type(scalar, 0);
 		this->value[1] = col_type(0, scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat 
 	(
 		T const & x0, T const & y0,
@@ -57,7 +57,7 @@ namespace glm
 		this->value[1] = col_type(x1, y1);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat(col_type const& v0, col_type const& v1)
 	{
 		this->value[0] = v0;
@@ -66,8 +66,8 @@ namespace glm
 
 	// -- Conversion constructors --
 
-	template <typename T, precision P>
-	template <typename X1, typename Y1, typename X2, typename Y2>
+	template<typename T, precision P>
+	template<typename X1, typename Y1, typename X2, typename Y2>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat 
 	(
 		X1 const & x1, Y1 const & y1,
@@ -78,8 +78,8 @@ namespace glm
 		this->value[1] = col_type(static_cast<T>(x2), value_type(y2));
 	}
 	
-	template <typename T, precision P>
-	template <typename V1, typename V2>
+	template<typename T, precision P>
+	template<typename V1, typename V2>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat(vec<2, V1, P> const& v1, vec<2, V2, P> const& v2)
 	{
 		this->value[0] = col_type(v1);
@@ -88,64 +88,64 @@ namespace glm
 
 	// -- mat2x2 matrix conversions --
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat(mat<2, 2, U, Q> const& m)
 	{
 		this->value[0] = col_type(m[0]);
 		this->value[1] = col_type(m[1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat(mat<3, 3, T, P> const& m)
 	{
 		this->value[0] = col_type(m[0]);
 		this->value[1] = col_type(m[1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat(mat<4, 4, T, P> const& m)
 	{
 		this->value[0] = col_type(m[0]);
 		this->value[1] = col_type(m[1]);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat(mat<2, 3, T, P> const& m)
 	{
 		this->value[0] = col_type(m[0]);
 		this->value[1] = col_type(m[1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat(mat<3, 2, T, P> const& m)
 	{
 		this->value[0] = m[0];
 		this->value[1] = m[1];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat(mat<2, 4, T, P> const& m)
 	{
 		this->value[0] = col_type(m[0]);
 		this->value[1] = col_type(m[1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat(mat<4, 2, T, P> const& m)
 	{
 		this->value[0] = m[0];
 		this->value[1] = m[1];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat(mat<3, 4, T, P> const& m)
 	{
 		this->value[0] = col_type(m[0]);
 		this->value[1] = col_type(m[1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>::mat(mat<4, 3, T, P> const& m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -154,14 +154,14 @@ namespace glm
 
 	// -- Accesses --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<2, 2, T, P>::col_type& mat<2, 2, T, P>::operator[](typename mat<2, 2, T, P>::length_type i)
 	{
 		assert(i < this->length());
 		return this->value[i];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<2, 2, T, P>::col_type const& mat<2, 2, T, P>::operator[](typename mat<2, 2, T, P>::length_type i) const
 	{
 		assert(i < this->length());
@@ -171,7 +171,7 @@ namespace glm
 	// -- Unary updatable operators --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<2, 2, T, P>& mat<2, 2, T, P>::operator=(mat<2, 2, T, P> const & m)
 		{
 			this->value[0] = m[0];
@@ -180,8 +180,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>& mat<2, 2, T, P>::operator=(mat<2, 2, U, P> const & m)
 	{
 		this->value[0] = m[0];
@@ -189,8 +189,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>& mat<2, 2, T, P>::operator+=(U scalar)
 	{
 		this->value[0] += scalar;
@@ -198,8 +198,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>& mat<2, 2, T, P>::operator+=(mat<2, 2, U, P> const & m)
 	{
 		this->value[0] += m[0];
@@ -207,8 +207,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>& mat<2, 2, T, P>::operator-=(U scalar)
 	{
 		this->value[0] -= scalar;
@@ -216,8 +216,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>& mat<2, 2, T, P>::operator-=(mat<2, 2, U, P> const & m)
 	{
 		this->value[0] -= m[0];
@@ -225,8 +225,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>& mat<2, 2, T, P>::operator*=(U scalar)
 	{
 		this->value[0] *= scalar;
@@ -234,15 +234,15 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>& mat<2, 2, T, P>::operator*=(mat<2, 2, U, P> const & m)
 	{
 		return (*this = *this * m);
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>& mat<2, 2, T, P>::operator/=(U scalar)
 	{
 		this->value[0] /= scalar;
@@ -250,8 +250,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>& mat<2, 2, T, P>::operator/=(mat<2, 2, U, P> const & m)
 	{
 		return *this *= inverse(m);
@@ -259,7 +259,7 @@ namespace glm
 
 	// -- Increment and decrement operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>& mat<2, 2, T, P>::operator++()
 	{
 		++this->value[0];
@@ -267,7 +267,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P>& mat<2, 2, T, P>::operator--()
 	{
 		--this->value[0];
@@ -275,7 +275,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> mat<2, 2, T, P>::operator++(int)
 	{
 		mat<2, 2, T, P> Result(*this);
@@ -283,7 +283,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> mat<2, 2, T, P>::operator--(int)
 	{
 		mat<2, 2, T, P> Result(*this);
@@ -293,13 +293,13 @@ namespace glm
 
 	// -- Unary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> operator+(mat<2, 2, T, P> const & m)
 	{
 		return m;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> operator-(mat<2, 2, T, P> const & m)
 	{
 		return mat<2, 2, T, P>(
@@ -309,7 +309,7 @@ namespace glm
 
 	// -- Binary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> operator+(mat<2, 2, T, P> const & m, T scalar)
 	{
 		return mat<2, 2, T, P>(
@@ -317,7 +317,7 @@ namespace glm
 			m[1] + scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> operator+(T scalar, mat<2, 2, T, P> const & m)
 	{
 		return mat<2, 2, T, P>(
@@ -325,7 +325,7 @@ namespace glm
 			m[1] + scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> operator+(mat<2, 2, T, P> const & m1, mat<2, 2, T, P> const & m2)
 	{
 		return mat<2, 2, T, P>(
@@ -333,7 +333,7 @@ namespace glm
 			m1[1] + m2[1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> operator-(mat<2, 2, T, P> const & m, T scalar)
 	{
 		return mat<2, 2, T, P>(
@@ -341,7 +341,7 @@ namespace glm
 			m[1] - scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> operator-(T scalar, mat<2, 2, T, P> const & m)
 	{
 		return mat<2, 2, T, P>(
@@ -349,7 +349,7 @@ namespace glm
 			scalar - m[1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> operator-(mat<2, 2, T, P> const & m1, mat<2, 2, T, P> const & m2)
 	{
 		return mat<2, 2, T, P>(
@@ -357,7 +357,7 @@ namespace glm
 			m1[1] - m2[1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> operator*(mat<2, 2, T, P> const & m, T scalar)
 	{
 		return mat<2, 2, T, P>(
@@ -365,7 +365,7 @@ namespace glm
 			m[1] * scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> operator*(T scalar, mat<2, 2, T, P> const & m)
 	{
 		return mat<2, 2, T, P>(
@@ -373,7 +373,7 @@ namespace glm
 			m[1] * scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<2, 2, T, P>::col_type operator*
 	(
 		mat<2, 2, T, P> const& m,
@@ -385,7 +385,7 @@ namespace glm
 			m[0][1] * v.x + m[1][1] * v.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<2, 2, T, P>::row_type operator*
 	(
 		typename mat<2, 2, T, P>::col_type const & v,
@@ -397,7 +397,7 @@ namespace glm
 			v.x * m[1][0] + v.y * m[1][1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> operator*(mat<2, 2, T, P> const & m1, mat<2, 2, T, P> const & m2)
 	{
 		return mat<2, 2, T, P>(
@@ -407,7 +407,7 @@ namespace glm
 			m1[0][1] * m2[1][0] + m1[1][1] * m2[1][1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> operator*(mat<2, 2, T, P> const & m1, mat<3, 2, T, P> const & m2)
 	{
 		return mat<3, 2, T, P>(
@@ -419,7 +419,7 @@ namespace glm
 			m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> operator*(mat<2, 2, T, P> const & m1, mat<4, 2, T, P> const & m2)
 	{
 		return mat<4, 2, T, P>(
@@ -433,7 +433,7 @@ namespace glm
 			m1[0][1] * m2[3][0] + m1[1][1] * m2[3][1]);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> operator/(mat<2, 2, T, P> const & m, T scalar)
 	{
 		return mat<2, 2, T, P>(
@@ -441,7 +441,7 @@ namespace glm
 			m[1] / scalar);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> operator/(T scalar, mat<2, 2, T, P> const & m)
 	{
 		return mat<2, 2, T, P>(
@@ -449,19 +449,19 @@ namespace glm
 			scalar / m[1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<2, 2, T, P>::col_type operator/(mat<2, 2, T, P> const & m, typename mat<2, 2, T, P>::row_type const & v)
 	{
 		return inverse(m) * v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<2, 2, T, P>::row_type operator/(typename mat<2, 2, T, P>::col_type const & v, mat<2, 2, T, P> const & m)
 	{
 		return v *  inverse(m);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> operator/(mat<2, 2, T, P> const & m1, mat<2, 2, T, P> const & m2)
 	{	
 		mat<2, 2, T, P> m1_copy(m1);
@@ -470,13 +470,13 @@ namespace glm
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator==(mat<2, 2, T, P> const & m1, mat<2, 2, T, P> const & m2)
 	{
 		return (m1[0] == m2[0]) && (m1[1] == m2[1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator!=(mat<2, 2, T, P> const & m1, mat<2, 2, T, P> const & m2)
 	{
 		return (m1[0] != m2[0]) || (m1[1] != m2[1]);
diff --git a/glm/detail/type_mat2x3.hpp b/glm/detail/type_mat2x3.hpp
index 1f0c96af..01eb777a 100644
--- a/glm/detail/type_mat2x3.hpp
+++ b/glm/detail/type_mat2x3.hpp
@@ -12,7 +12,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct mat<2, 3, T, P>
 	{
 		typedef vec<3, T, P> col_type;
@@ -29,7 +29,7 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT_CTOR;
 		GLM_FUNC_DECL mat(mat<2, 3, T, P> const & m) GLM_DEFAULT;
-		template <precision Q>
+		template<precision Q>
 		GLM_FUNC_DECL mat(mat<2, 3, T, Q> const & m);
 
 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit mat(ctor);
@@ -43,19 +43,19 @@ namespace glm
 
 		// -- Conversions --
 
-		template <typename X1, typename Y1, typename Z1, typename X2, typename Y2, typename Z2>
+		template<typename X1, typename Y1, typename Z1, typename X2, typename Y2, typename Z2>
 		GLM_FUNC_DECL mat(
 			X1 x1, Y1 y1, Z1 z1,
 			X2 x2, Y2 y2, Z2 z2);
 
-		template <typename U, typename V>
+		template<typename U, typename V>
 		GLM_FUNC_DECL mat(
 			vec<3, U, P> const & v1,
 			vec<3, V, P> const & v2);
 
 		// -- Matrix conversions --
 
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 3, U, Q> const & m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, T, P> const & x);
@@ -79,19 +79,19 @@ namespace glm
 
 		GLM_FUNC_DECL mat<2, 3, T, P> & operator=(mat<2, 3, T, P> const & m) GLM_DEFAULT;
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 3, T, P> & operator=(mat<2, 3, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 3, T, P> & operator+=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 3, T, P> & operator+=(mat<2, 3, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 3, T, P> & operator-=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 3, T, P> & operator-=(mat<2, 3, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 3, T, P> & operator*=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 3, T, P> & operator/=(U s);
 
 		// -- Increment and decrement operators --
@@ -104,59 +104,59 @@ namespace glm
 
 	// -- Unary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 3, T, P> operator+(mat<2, 3, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 3, T, P> operator-(mat<2, 3, T, P> const & m);
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 3, T, P> operator+(mat<2, 3, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 3, T, P> operator+(mat<2, 3, T, P> const & m1, mat<2, 3, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 3, T, P> operator-(mat<2, 3, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 3, T, P> operator-(mat<2, 3, T, P> const & m1, mat<2, 3, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 3, T, P> operator*(mat<2, 3, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 3, T, P> operator*(T scalar, mat<2, 3, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<2, 3, T, P>::col_type operator*(mat<2, 3, T, P> const & m, typename mat<2, 3, T, P>::row_type const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<2, 3, T, P>::row_type operator*(typename mat<2, 3, T, P>::col_type const & v, mat<2, 3, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 3, T, P> operator*(mat<2, 3, T, P> const & m1, mat<2, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> operator*(mat<2, 3, T, P> const & m1, mat<3, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 3, T, P> operator*(mat<2, 3, T, P> const & m1, mat<4, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 3, T, P> operator/(mat<2, 3, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 3, T, P> operator/(T scalar, mat<2, 3, T, P> const & m);
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator==(mat<2, 3, T, P> const & m1, mat<2, 3, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator!=(mat<2, 3, T, P> const & m1, mat<2, 3, T, P> const & m2);
 }//namespace glm
 
diff --git a/glm/detail/type_mat2x3.inl b/glm/detail/type_mat2x3.inl
index 2688399e..e18ab386 100644
--- a/glm/detail/type_mat2x3.inl
+++ b/glm/detail/type_mat2x3.inl
@@ -6,7 +6,7 @@ namespace glm
 	// -- Constructors --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-		template <typename T, precision P> 
+		template<typename T, precision P> 
 		GLM_FUNC_QUALIFIER mat<2, 3, T, P>::mat()
 		{
 #			ifndef GLM_FORCE_NO_CTOR_INIT 
@@ -17,7 +17,7 @@ namespace glm
 #	endif
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<2, 3, T, P>::mat(mat<2, 3, T, P> const & m)
 		{
 			this->value[0] = m.value[0];
@@ -25,26 +25,26 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <precision Q>
+	template<typename T, precision P>
+	template<precision Q>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>::mat(mat<2, 3, T, Q> const & m)
 	{
 		this->value[0] = m.value[0];
 		this->value[1] = m.value[1];
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR mat<2, 3, T, P>::mat(ctor)
 	{}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>::mat(T scalar)
 	{
 		this->value[0] = col_type(scalar, 0, 0);
 		this->value[1] = col_type(0, scalar, 0);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>::mat 
 	(
 		T x0, T y0, T z0,
@@ -55,7 +55,7 @@ namespace glm
 		this->value[1] = col_type(x1, y1, z1);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>::mat(col_type const & v0, col_type const & v1)
 	{
 		this->value[0] = v0;
@@ -64,8 +64,8 @@ namespace glm
 
 	// -- Conversion constructors --
 
-	template <typename T, precision P>
-	template <
+	template<typename T, precision P>
+	template<
 		typename X1, typename Y1, typename Z1,
 		typename X2, typename Y2, typename Z2>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>::mat 
@@ -78,8 +78,8 @@ namespace glm
 		this->value[1] = col_type(static_cast<T>(x2), value_type(y2), value_type(z2));
 	}
 	
-	template <typename T, precision P>
-	template <typename V1, typename V2>
+	template<typename T, precision P>
+	template<typename V1, typename V2>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>::mat(vec<3, V1, P> const & v1, vec<3, V2, P> const & v2)
 	{
 		this->value[0] = col_type(v1);
@@ -88,64 +88,64 @@ namespace glm
 
 	// -- Matrix conversions --
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>::mat(mat<2, 3, U, Q> const & m)
 	{
 		this->value[0] = col_type(m[0]);
 		this->value[1] = col_type(m[1]);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>::mat(mat<2, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
 		this->value[1] = col_type(m[1], 0);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER  mat<2, 3, T, P>::mat(mat<3, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
 		this->value[1] = col_type(m[1]);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>::mat(mat<4, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
 		this->value[1] = col_type(m[1]);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>::mat(mat<2, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
 		this->value[1] = col_type(m[1]);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>::mat(mat<3, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
 		this->value[1] = col_type(m[1], 0);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>::mat(mat<3, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
 		this->value[1] = col_type(m[1]);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>::mat(mat<4, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
 		this->value[1] = col_type(m[1], 0);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>::mat(mat<4, 3, T, P> const & m)
 	{
 		this->value[0] = m[0];
@@ -154,14 +154,14 @@ namespace glm
 
 	// -- Accesses --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<2, 3, T, P>::col_type & mat<2, 3, T, P>::operator[](typename mat<2, 3, T, P>::length_type i)
 	{
 		assert(i < this->length());
 		return this->value[i];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<2, 3, T, P>::col_type const & mat<2, 3, T, P>::operator[](typename mat<2, 3, T, P>::length_type i) const
 	{
 		assert(i < this->length());
@@ -171,7 +171,7 @@ namespace glm
 	// -- Unary updatable operators --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<2, 3, T, P>& mat<2, 3, T, P>::operator=(mat<2, 3, T, P> const & m)
 		{
 			this->value[0] = m[0];
@@ -180,8 +180,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>& mat<2, 3, T, P>::operator=(mat<2, 3, U, P> const & m)
 	{
 		this->value[0] = m[0];
@@ -189,8 +189,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> & mat<2, 3, T, P>::operator+=(U s)
 	{
 		this->value[0] += s;
@@ -198,8 +198,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>& mat<2, 3, T, P>::operator+=(mat<2, 3, U, P> const & m)
 	{
 		this->value[0] += m[0];
@@ -207,8 +207,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>& mat<2, 3, T, P>::operator-=(U s)
 	{
 		this->value[0] -= s;
@@ -216,8 +216,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>& mat<2, 3, T, P>::operator-=(mat<2, 3, U, P> const & m)
 	{
 		this->value[0] -= m[0];
@@ -225,8 +225,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P>& mat<2, 3, T, P>::operator*=(U s)
 	{
 		this->value[0] *= s;
@@ -234,8 +234,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> & mat<2, 3, T, P>::operator/=(U s)
 	{
 		this->value[0] /= s;
@@ -245,7 +245,7 @@ namespace glm
 
 	// -- Increment and decrement operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> & mat<2, 3, T, P>::operator++()
 	{
 		++this->value[0];
@@ -253,7 +253,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> & mat<2, 3, T, P>::operator--()
 	{
 		--this->value[0];
@@ -261,7 +261,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> mat<2, 3, T, P>::operator++(int)
 	{
 		mat<2, 3, T, P> Result(*this);
@@ -269,7 +269,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> mat<2, 3, T, P>::operator--(int)
 	{
 		mat<2, 3, T, P> Result(*this);
@@ -279,13 +279,13 @@ namespace glm
 
 	// -- Unary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> operator+(mat<2, 3, T, P> const & m)
 	{
 		return m;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> operator-(mat<2, 3, T, P> const & m)
 	{
 		return mat<2, 3, T, P>(
@@ -295,7 +295,7 @@ namespace glm
 
 	// -- Binary arithmetic operators --
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> operator+(mat<2, 3, T, P> const & m, T scalar)
 	{
 		return mat<2, 3, T, P>(
@@ -303,7 +303,7 @@ namespace glm
 			m[1] + scalar);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> operator+(mat<2, 3, T, P> const & m1, mat<2, 3, T, P> const & m2)
 	{
 		return mat<2, 3, T, P>(
@@ -311,7 +311,7 @@ namespace glm
 			m1[1] + m2[1]);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> operator-(mat<2, 3, T, P> const & m, T scalar)
 	{
 		return mat<2, 3, T, P>(
@@ -319,7 +319,7 @@ namespace glm
 			m[1] - scalar);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> operator-(mat<2, 3, T, P> const & m1, mat<2, 3, T, P> const & m2)
 	{
 		return mat<2, 3, T, P>(
@@ -327,7 +327,7 @@ namespace glm
 			m1[1] - m2[1]);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> operator*(mat<2, 3, T, P> const & m, T scalar)
 	{
 		return mat<2, 3, T, P>(
@@ -335,7 +335,7 @@ namespace glm
 			m[1] * scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> operator*(T scalar, mat<2, 3, T, P> const & m)
 	{
 		return mat<2, 3, T, P>(
@@ -343,7 +343,7 @@ namespace glm
 			m[1] * scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<2, 3, T, P>::col_type operator*
 	(
 		mat<2, 3, T, P> const& m,
@@ -355,7 +355,7 @@ namespace glm
 			m[0][2] * v.x + m[1][2] * v.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<2, 3, T, P>::row_type operator*
 	(
 		typename mat<2, 3, T, P>::col_type const & v,
@@ -366,7 +366,7 @@ namespace glm
 			v.x * m[1][0] + v.y * m[1][1] + v.z * m[1][2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> operator*(mat<2, 3, T, P> const & m1, mat<2, 2, T, P> const & m2)
 	{
 		return mat<2, 3, T, P>(
@@ -378,7 +378,7 @@ namespace glm
 			m1[0][2] * m2[1][0] + m1[1][2] * m2[1][1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> operator*(mat<2, 3, T, P> const & m1, mat<3, 2, T, P> const & m2)
 	{
 		T SrcA00 = m1[0][0];
@@ -408,7 +408,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> operator*(mat<2, 3, T, P> const & m1, mat<4, 2, T, P> const & m2)
 	{
 		return mat<4, 3, T, P>(
@@ -426,7 +426,7 @@ namespace glm
 			m1[0][2] * m2[3][0] + m1[1][2] * m2[3][1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> operator/(mat<2, 3, T, P> const & m, T scalar)
 	{
 		return mat<2, 3, T, P>(
@@ -434,7 +434,7 @@ namespace glm
 			m[1] / scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> operator/(T scalar, mat<2, 3, T, P> const & m)
 	{
 		return mat<2, 3, T, P>(
@@ -444,13 +444,13 @@ namespace glm
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator==(mat<2, 3, T, P> const & m1, mat<2, 3, T, P> const & m2)
 	{
 		return (m1[0] == m2[0]) && (m1[1] == m2[1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator!=(mat<2, 3, T, P> const & m1, mat<2, 3, T, P> const & m2)
 	{
 		return (m1[0] != m2[0]) || (m1[1] != m2[1]);
diff --git a/glm/detail/type_mat2x4.hpp b/glm/detail/type_mat2x4.hpp
index b1dd78b4..cfe61f4e 100644
--- a/glm/detail/type_mat2x4.hpp
+++ b/glm/detail/type_mat2x4.hpp
@@ -12,7 +12,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct mat<2, 4, T, P>
 	{
 		typedef vec<4, T, P> col_type;
@@ -29,7 +29,7 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT_CTOR;
 		GLM_FUNC_DECL mat(mat<2, 4, T, P> const & m) GLM_DEFAULT;
-		template <precision Q>
+		template<precision Q>
 		GLM_FUNC_DECL mat(mat<2, 4, T, Q> const & m);
 
 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit mat(ctor);
@@ -43,21 +43,21 @@ namespace glm
 
 		// -- Conversions --
 
-		template <
+		template<
 			typename X1, typename Y1, typename Z1, typename W1,
 			typename X2, typename Y2, typename Z2, typename W2>
 		GLM_FUNC_DECL mat(
 			X1 x1, Y1 y1, Z1 z1, W1 w1,
 			X2 x2, Y2 y2, Z2 z2, W2 w2);
 
-		template <typename U, typename V>
+		template<typename U, typename V>
 		GLM_FUNC_DECL mat(
 			vec<4, U, P> const & v1,
 			vec<4, V, P> const & v2);
 
 		// -- Matrix conversions --
 
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 4, U, Q> const & m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, T, P> const & x);
@@ -81,19 +81,19 @@ namespace glm
 
 		GLM_FUNC_DECL mat<2, 4, T, P> & operator=(mat<2, 4, T, P> const & m) GLM_DEFAULT;
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 4, T, P> & operator=(mat<2, 4, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 4, T, P> & operator+=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 4, T, P> & operator+=(mat<2, 4, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 4, T, P> & operator-=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 4, T, P> & operator-=(mat<2, 4, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 4, T, P> & operator*=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<2, 4, T, P> & operator/=(U s);
 
 		// -- Increment and decrement operators --
@@ -106,59 +106,59 @@ namespace glm
 
 	// -- Unary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 4, T, P> operator+(mat<2, 4, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 4, T, P> operator-(mat<2, 4, T, P> const & m);
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 4, T, P> operator+(mat<2, 4, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 4, T, P> operator+(mat<2, 4, T, P> const & m1, mat<2, 4, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 4, T, P> operator-(mat<2, 4, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 4, T, P> operator-(mat<2, 4, T, P> const & m1, mat<2, 4, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 4, T, P> operator*(mat<2, 4, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 4, T, P> operator*(T scalar, mat<2, 4, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<2, 4, T, P>::col_type operator*(mat<2, 4, T, P> const & m, typename mat<2, 4, T, P>::row_type const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<2, 4, T, P>::row_type operator*(typename mat<2, 4, T, P>::col_type const & v, mat<2, 4, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> operator*(mat<2, 4, T, P> const & m1, mat<4, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 4, T, P> operator*(mat<2, 4, T, P> const & m1, mat<2, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 4, T, P> operator*(mat<2, 4, T, P> const & m1, mat<3, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 4, T, P> operator/(mat<2, 4, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 4, T, P> operator/(T scalar, mat<2, 4, T, P> const & m);
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator==(mat<2, 4, T, P> const & m1, mat<2, 4, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator!=(mat<2, 4, T, P> const & m1, mat<2, 4, T, P> const & m2);
 }//namespace glm
 
diff --git a/glm/detail/type_mat2x4.inl b/glm/detail/type_mat2x4.inl
index 53710f12..ee9c3c42 100644
--- a/glm/detail/type_mat2x4.inl
+++ b/glm/detail/type_mat2x4.inl
@@ -6,7 +6,7 @@ namespace glm
 	// -- Constructors --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat()
 		{
 #			ifndef GLM_FORCE_NO_CTOR_INIT 
@@ -17,7 +17,7 @@ namespace glm
 #	endif
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat(mat<2, 4, T, P> const & m)
 		{
 			this->value[0] = m.value[0];
@@ -25,19 +25,19 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <precision Q>
+	template<typename T, precision P>
+	template<precision Q>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat(mat<2, 4, T, Q> const & m)
 	{
 		this->value[0] = m.value[0];
 		this->value[1] = m.value[1];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR mat<2, 4, T, P>::mat(ctor)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat(T scalar)
 	{
 		value_type const Zero(0);
@@ -45,7 +45,7 @@ namespace glm
 		this->value[1] = col_type(Zero, scalar, Zero, Zero);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat
 	(
 		T x0, T y0, T z0, T w0,
@@ -56,7 +56,7 @@ namespace glm
 		this->value[1] = col_type(x1, y1, z1, w1);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat(col_type const & v0, col_type const & v1)
 	{
 		this->value[0] = v0;
@@ -65,8 +65,8 @@ namespace glm
 
 	// -- Conversion constructors --
 
-	template <typename T, precision P>
-	template <
+	template<typename T, precision P>
+	template<
 		typename X1, typename Y1, typename Z1, typename W1,
 		typename X2, typename Y2, typename Z2, typename W2>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat
@@ -79,8 +79,8 @@ namespace glm
 		this->value[1] = col_type(static_cast<T>(x2), value_type(y2), value_type(z2), value_type(w2));
 	}
 	
-	template <typename T, precision P>
-	template <typename V1, typename V2>
+	template<typename T, precision P>
+	template<typename V1, typename V2>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat(vec<4, V1, P> const & v1, vec<4, V2, P> const & v2)
 	{
 		this->value[0] = col_type(v1);
@@ -89,64 +89,64 @@ namespace glm
 
 	// -- Matrix conversions --
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat(mat<2, 4, U, Q> const & m)
 	{
 		this->value[0] = col_type(m[0]);
 		this->value[1] = col_type(m[1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat(mat<2, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0, 0);
 		this->value[1] = col_type(m[1], 0, 0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat(mat<3, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
 		this->value[1] = col_type(m[1], 0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat(mat<4, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
 		this->value[1] = col_type(m[1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat(mat<2, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
 		this->value[1] = col_type(m[1], 0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat(mat<3, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0, 0);
 		this->value[1] = col_type(m[1], 0, 0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat(mat<3, 4, T, P> const & m)
 	{
 		this->value[0] = m[0];
 		this->value[1] = m[1];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat(mat<4, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0, 0);
 		this->value[1] = col_type(m[1], 0, 0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>::mat(mat<4, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
@@ -155,14 +155,14 @@ namespace glm
 
 	// -- Accesses --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<2, 4, T, P>::col_type & mat<2, 4, T, P>::operator[](typename mat<2, 4, T, P>::length_type i)
 	{
 		assert(i < this->length());
 		return this->value[i];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<2, 4, T, P>::col_type const & mat<2, 4, T, P>::operator[](typename mat<2, 4, T, P>::length_type i) const
 	{
 		assert(i < this->length());
@@ -172,7 +172,7 @@ namespace glm
 	// -- Unary updatable operators --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<2, 4, T, P>& mat<2, 4, T, P>::operator=(mat<2, 4, T, P> const & m)
 		{
 			this->value[0] = m[0];
@@ -181,8 +181,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>& mat<2, 4, T, P>::operator=(mat<2, 4, U, P> const & m)
 	{
 		this->value[0] = m[0];
@@ -190,8 +190,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>& mat<2, 4, T, P>::operator+=(U s)
 	{
 		this->value[0] += s;
@@ -199,8 +199,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>& mat<2, 4, T, P>::operator+=(mat<2, 4, U, P> const & m)
 	{
 		this->value[0] += m[0];
@@ -208,8 +208,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>& mat<2, 4, T, P>::operator-=(U s)
 	{
 		this->value[0] -= s;
@@ -217,8 +217,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>& mat<2, 4, T, P>::operator-=(mat<2, 4, U, P> const & m)
 	{
 		this->value[0] -= m[0];
@@ -226,8 +226,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>& mat<2, 4, T, P>::operator*=(U s)
 	{
 		this->value[0] *= s;
@@ -235,8 +235,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> & mat<2, 4, T, P>::operator/=(U s)
 	{
 		this->value[0] /= s;
@@ -246,7 +246,7 @@ namespace glm
 
 	// -- Increment and decrement operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>& mat<2, 4, T, P>::operator++()
 	{
 		++this->value[0];
@@ -254,7 +254,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P>& mat<2, 4, T, P>::operator--()
 	{
 		--this->value[0];
@@ -262,7 +262,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> mat<2, 4, T, P>::operator++(int)
 	{
 		mat<2, 4, T, P> Result(*this);
@@ -270,7 +270,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> mat<2, 4, T, P>::operator--(int)
 	{
 		mat<2, 4, T, P> Result(*this);
@@ -280,13 +280,13 @@ namespace glm
 
 	// -- Unary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> operator+(mat<2, 4, T, P> const & m)
 	{
 		return m;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> operator-(mat<2, 4, T, P> const & m)
 	{
 		return mat<2, 4, T, P>(
@@ -296,7 +296,7 @@ namespace glm
 
 	// -- Binary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> operator+(mat<2, 4, T, P> const & m, T scalar)
 	{
 		return mat<2, 4, T, P>(
@@ -304,7 +304,7 @@ namespace glm
 			m[1] + scalar);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> operator+(mat<2, 4, T, P> const & m1, mat<2, 4, T, P> const & m2)
 	{
 		return mat<2, 4, T, P>(
@@ -312,7 +312,7 @@ namespace glm
 			m1[1] + m2[1]);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> operator-(mat<2, 4, T, P> const & m, T scalar)
 	{
 		return mat<2, 4, T, P>(
@@ -320,7 +320,7 @@ namespace glm
 			m[1] - scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> operator-(mat<2, 4, T, P> const & m1, mat<2, 4, T, P> const & m2)
 	{
 		return mat<2, 4, T, P>(
@@ -328,7 +328,7 @@ namespace glm
 			m1[1] - m2[1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> operator*(mat<2, 4, T, P> const & m, T scalar)
 	{
 		return mat<2, 4, T, P>(
@@ -336,7 +336,7 @@ namespace glm
 			m[1] * scalar);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> operator*(T scalar, mat<2, 4, T, P> const & m)
 	{
 		return mat<2, 4, T, P>(
@@ -344,7 +344,7 @@ namespace glm
 			m[1] * scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<2, 4, T, P>::col_type operator*(mat<2, 4, T, P> const & m, typename mat<2, 4, T, P>::row_type const & v)
 	{
 		return typename mat<2, 4, T, P>::col_type(
@@ -354,7 +354,7 @@ namespace glm
 			m[0][3] * v.x + m[1][3] * v.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<2, 4, T, P>::row_type operator*(typename mat<2, 4, T, P>::col_type const & v, mat<2, 4, T, P> const & m)
 	{
 		return typename mat<2, 4, T, P>::row_type(
@@ -362,7 +362,7 @@ namespace glm
 			v.x * m[1][0] + v.y * m[1][1] + v.z * m[1][2] + v.w * m[1][3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> operator*(mat<2, 4, T, P> const & m1, mat<4, 2, T, P> const & m2)
 	{
 		T SrcA00 = m1[0][0];
@@ -403,7 +403,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> operator*(mat<2, 4, T, P> const & m1, mat<2, 2, T, P> const & m2)
 	{
 		return mat<2, 4, T, P>(
@@ -417,7 +417,7 @@ namespace glm
 			m1[0][3] * m2[1][0] + m1[1][3] * m2[1][1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> operator*(mat<2, 4, T, P> const & m1, mat<3, 2, T, P> const & m2)
 	{
 		return mat<3, 4, T, P>(
@@ -435,7 +435,7 @@ namespace glm
 			m1[0][3] * m2[2][0] + m1[1][3] * m2[2][1]);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> operator/(mat<2, 4, T, P> const & m, T scalar)
 	{
 		return mat<2, 4, T, P>(
@@ -443,7 +443,7 @@ namespace glm
 			m[1] / scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> operator/(T scalar, mat<2, 4, T, P> const & m)
 	{
 		return mat<2, 4, T, P>(
@@ -453,13 +453,13 @@ namespace glm
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator==(mat<2, 4, T, P> const & m1, mat<2, 4, T, P> const & m2)
 	{
 		return (m1[0] == m2[0]) && (m1[1] == m2[1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator!=(mat<2, 4, T, P> const & m1, mat<2, 4, T, P> const & m2)
 	{
 		return (m1[0] != m2[0]) || (m1[1] != m2[1]);
diff --git a/glm/detail/type_mat3x2.hpp b/glm/detail/type_mat3x2.hpp
index 699b80cf..f738dc60 100644
--- a/glm/detail/type_mat3x2.hpp
+++ b/glm/detail/type_mat3x2.hpp
@@ -12,7 +12,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct mat<3, 2, T, P>
 	{
 		typedef vec<2, T, P> col_type;
@@ -29,7 +29,7 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT_CTOR;
 		GLM_FUNC_DECL mat(mat<3, 2, T, P> const & m) GLM_DEFAULT;
-		template <precision Q>
+		template<precision Q>
 		GLM_FUNC_DECL mat(mat<3, 2, T, Q> const & m);
 
 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit mat(ctor);
@@ -54,7 +54,7 @@ namespace glm
 			X2 x2, Y2 y2,
 			X3 x3, Y3 y3);
 
-		template <typename V1, typename V2, typename V3>
+		template<typename V1, typename V2, typename V3>
 		GLM_FUNC_DECL mat(
 			vec<2, V1, P> const & v1,
 			vec<2, V2, P> const & v2,
@@ -62,7 +62,7 @@ namespace glm
 
 		// -- Matrix conversions --
 
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 2, U, Q> const & m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, T, P> const & x);
@@ -86,19 +86,19 @@ namespace glm
 
 		GLM_FUNC_DECL mat<3, 2, T, P> & operator=(mat<3, 2, T, P> const & m) GLM_DEFAULT;
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 2, T, P> & operator=(mat<3, 2, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 2, T, P> & operator+=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 2, T, P> & operator+=(mat<3, 2, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 2, T, P> & operator-=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 2, T, P> & operator-=(mat<3, 2, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 2, T, P> & operator*=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 2, T, P> & operator/=(U s);
 
 		// -- Increment and decrement operators --
@@ -111,59 +111,59 @@ namespace glm
 
 	// -- Unary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 2, T, P> operator+(mat<3, 2, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 2, T, P> operator-(mat<3, 2, T, P> const & m);
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 2, T, P> operator+(mat<3, 2, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 2, T, P> operator+(mat<3, 2, T, P> const & m1, mat<3, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 2, T, P> operator-(mat<3, 2, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 2, T, P> operator-(mat<3, 2, T, P> const & m1, mat<3, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 2, T, P> operator*(mat<3, 2, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 2, T, P> operator*(T scalar, mat<3, 2, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<3, 2, T, P>::col_type operator*(mat<3, 2, T, P> const & m, typename mat<3, 2, T, P>::row_type const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<3, 2, T, P>::row_type operator*(typename mat<3, 2, T, P>::col_type const & v, mat<3, 2, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> operator*(mat<3, 2, T, P> const & m1, mat<2, 3, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 2, T, P> operator*(mat<3, 2, T, P> const & m1, mat<3, 3, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 2, T, P> operator*(mat<3, 2, T, P> const & m1, mat<4, 3, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 2, T, P> operator/(mat<3, 2, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 2, T, P> operator/(T scalar, mat<3, 2, T, P> const & m);
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator==(mat<3, 2, T, P> const & m1, mat<3, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator!=(mat<3, 2, T, P> const & m1, mat<3, 2, T, P> const & m2);
 
 }//namespace glm
diff --git a/glm/detail/type_mat3x2.inl b/glm/detail/type_mat3x2.inl
index d33e2f98..9f66a015 100644
--- a/glm/detail/type_mat3x2.inl
+++ b/glm/detail/type_mat3x2.inl
@@ -6,7 +6,7 @@ namespace glm
 	// -- Constructors --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-		template <typename T, precision P> 
+		template<typename T, precision P> 
 		GLM_FUNC_QUALIFIER mat<3, 2, T, P>::mat()
 		{
 #			ifndef GLM_FORCE_NO_CTOR_INIT 
@@ -18,7 +18,7 @@ namespace glm
 #	endif
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<3, 2, T, P>::mat(mat<3, 2, T, P> const & m)
 		{
 			this->value[0] = m.value[0];
@@ -27,8 +27,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <precision Q>
+	template<typename T, precision P>
+	template<precision Q>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>::mat(mat<3, 2, T, Q> const & m)
 	{
 		this->value[0] = m.value[0];
@@ -36,11 +36,11 @@ namespace glm
 		this->value[2] = m.value[2];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR mat<3, 2, T, P>::mat(ctor)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>::mat(T scalar)
 	{
 		this->value[0] = col_type(scalar, 0);
@@ -48,7 +48,7 @@ namespace glm
 		this->value[2] = col_type(0, 0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>::mat
 	(
 		T x0, T y0,
@@ -61,7 +61,7 @@ namespace glm
 		this->value[2] = col_type(x2, y2);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>::mat
 	(
 		col_type const & v0,
@@ -76,8 +76,8 @@ namespace glm
 
 	// -- Conversion constructors --
 
-	template <typename T, precision P>
-	template <
+	template<typename T, precision P>
+	template<
 		typename X1, typename Y1,
 		typename X2, typename Y2,
 		typename X3, typename Y3>
@@ -93,8 +93,8 @@ namespace glm
 		this->value[2] = col_type(static_cast<T>(x3), value_type(y3));
 	}
 
-	template <typename T, precision P>
-	template <typename V1, typename V2, typename V3>
+	template<typename T, precision P>
+	template<typename V1, typename V2, typename V3>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>::mat
 	(
 		vec<2, V1, P> const & v1,
@@ -109,8 +109,8 @@ namespace glm
 
 	// -- Matrix conversions --
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>::mat(mat<3, 2, U, Q> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -118,7 +118,7 @@ namespace glm
 		this->value[2] = col_type(m[2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>::mat(mat<2, 2, T, P> const & m)
 	{
 		this->value[0] = m[0];
@@ -126,7 +126,7 @@ namespace glm
 		this->value[2] = col_type(0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>::mat(mat<3, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -134,7 +134,7 @@ namespace glm
 		this->value[2] = col_type(m[2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>::mat(mat<4, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -142,7 +142,7 @@ namespace glm
 		this->value[2] = col_type(m[2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>::mat(mat<2, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -150,7 +150,7 @@ namespace glm
 		this->value[2] = col_type(T(0));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>::mat(mat<2, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -158,7 +158,7 @@ namespace glm
 		this->value[2] = col_type(T(0));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>::mat(mat<3, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -166,7 +166,7 @@ namespace glm
 		this->value[2] = col_type(m[2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>::mat(mat<4, 2, T, P> const & m)
 	{
 		this->value[0] = m[0];
@@ -174,7 +174,7 @@ namespace glm
 		this->value[2] = m[2];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>::mat(mat<4, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -184,14 +184,14 @@ namespace glm
 
 	// -- Accesses --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<3, 2, T, P>::col_type & mat<3, 2, T, P>::operator[](typename mat<3, 2, T, P>::length_type i)
 	{
 		assert(i < this->length());
 		return this->value[i];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<3, 2, T, P>::col_type const & mat<3, 2, T, P>::operator[](typename mat<3, 2, T, P>::length_type i) const
 	{
 		assert(i < this->length());
@@ -201,7 +201,7 @@ namespace glm
 	// -- Unary updatable operators --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<3, 2, T, P>& mat<3, 2, T, P>::operator=(mat<3, 2, T, P> const & m)
 		{
 			this->value[0] = m[0];
@@ -211,8 +211,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>& mat<3, 2, T, P>::operator=(mat<3, 2, U, P> const & m)
 	{
 		this->value[0] = m[0];
@@ -221,8 +221,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>& mat<3, 2, T, P>::operator+=(U s)
 	{
 		this->value[0] += s;
@@ -231,8 +231,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>& mat<3, 2, T, P>::operator+=(mat<3, 2, U, P> const & m)
 	{
 		this->value[0] += m[0];
@@ -241,8 +241,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>& mat<3, 2, T, P>::operator-=(U s)
 	{
 		this->value[0] -= s;
@@ -251,8 +251,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>& mat<3, 2, T, P>::operator-=(mat<3, 2, U, P> const & m)
 	{
 		this->value[0] -= m[0];
@@ -261,8 +261,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>& mat<3, 2, T, P>::operator*=(U s)
 	{
 		this->value[0] *= s;
@@ -271,8 +271,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> & mat<3, 2, T, P>::operator/=(U s)
 	{
 		this->value[0] /= s;
@@ -283,7 +283,7 @@ namespace glm
 
 	// -- Increment and decrement operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>& mat<3, 2, T, P>::operator++()
 	{
 		++this->value[0];
@@ -292,7 +292,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P>& mat<3, 2, T, P>::operator--()
 	{
 		--this->value[0];
@@ -301,7 +301,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> mat<3, 2, T, P>::operator++(int)
 	{
 		mat<3, 2, T, P> Result(*this);
@@ -309,7 +309,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> mat<3, 2, T, P>::operator--(int)
 	{
 		mat<3, 2, T, P> Result(*this);
@@ -319,13 +319,13 @@ namespace glm
 
 	// -- Unary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> operator+(mat<3, 2, T, P> const & m)
 	{
 		return m;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> operator-(mat<3, 2, T, P> const & m)
 	{
 		return mat<3, 2, T, P>(
@@ -336,7 +336,7 @@ namespace glm
 
 	// -- Binary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> operator+(mat<3, 2, T, P> const & m, T scalar)
 	{
 		return mat<3, 2, T, P>(
@@ -345,7 +345,7 @@ namespace glm
 			m[2] + scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> operator+(mat<3, 2, T, P> const & m1, mat<3, 2, T, P> const & m2)
 	{
 		return mat<3, 2, T, P>(
@@ -354,7 +354,7 @@ namespace glm
 			m1[2] + m2[2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> operator-(mat<3, 2, T, P> const & m, T scalar)
 	{
 		return mat<3, 2, T, P>(
@@ -363,7 +363,7 @@ namespace glm
 			m[2] - scalar);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> operator-(mat<3, 2, T, P> const & m1, mat<3, 2, T, P> const & m2)
 	{
 		return mat<3, 2, T, P>(
@@ -372,7 +372,7 @@ namespace glm
 			m1[2] - m2[2]);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> operator*(mat<3, 2, T, P> const & m, T scalar)
 	{
 		return mat<3, 2, T, P>(
@@ -381,7 +381,7 @@ namespace glm
 			m[2] * scalar);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> operator*(T scalar, mat<3, 2, T, P> const & m)
 	{
 		return mat<3, 2, T, P>(
@@ -390,7 +390,7 @@ namespace glm
 			m[2] * scalar);
 	}
    
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<3, 2, T, P>::col_type operator*(mat<3, 2, T, P> const & m, typename mat<3, 2, T, P>::row_type const & v)
 	{
 		return typename mat<3, 2, T, P>::col_type(
@@ -398,7 +398,7 @@ namespace glm
 			m[0][1] * v.x + m[1][1] * v.y + m[2][1] * v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<3, 2, T, P>::row_type operator*(typename mat<3, 2, T, P>::col_type const & v, mat<3, 2, T, P> const & m)
 	{
 		return typename mat<3, 2, T, P>::row_type(
@@ -407,7 +407,7 @@ namespace glm
 			v.x * m[2][0] + v.y * m[2][1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> operator*(mat<3, 2, T, P> const & m1, mat<2, 3, T, P> const & m2)
 	{
 		const T SrcA00 = m1[0][0];
@@ -432,7 +432,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> operator*(mat<3, 2, T, P> const & m1, mat<3, 3, T, P> const & m2)
 	{
 		return mat<3, 2, T, P>(
@@ -444,7 +444,7 @@ namespace glm
 			m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1] + m1[2][1] * m2[2][2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> operator*(mat<3, 2, T, P> const & m1, mat<4, 3, T, P> const & m2)
 	{
 		return mat<4, 2, T, P>(
@@ -458,7 +458,7 @@ namespace glm
 			m1[0][1] * m2[3][0] + m1[1][1] * m2[3][1] + m1[2][1] * m2[3][2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> operator/(mat<3, 2, T, P> const & m, T scalar)
 	{
 		return mat<3, 2, T, P>(
@@ -467,7 +467,7 @@ namespace glm
 			m[2] / scalar);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> operator/(T scalar, mat<3, 2, T, P> const & m)
 	{
 		return mat<3, 2, T, P>(
@@ -478,13 +478,13 @@ namespace glm
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator==(mat<3, 2, T, P> const & m1, mat<3, 2, T, P> const & m2)
 	{
 		return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER bool operator!=(mat<3, 2, T, P> const & m1, mat<3, 2, T, P> const & m2)
 	{
 		return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]);
diff --git a/glm/detail/type_mat3x3.hpp b/glm/detail/type_mat3x3.hpp
index 2dcec20e..1a9f3365 100644
--- a/glm/detail/type_mat3x3.hpp
+++ b/glm/detail/type_mat3x3.hpp
@@ -11,7 +11,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct mat<3, 3, T, P>
 	{
 		typedef vec<3, T, P> col_type;
@@ -28,7 +28,7 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT_CTOR;
 		GLM_FUNC_DECL mat(mat<3, 3, T, P> const & m) GLM_DEFAULT;
-		template <precision Q>
+		template<precision Q>
 		GLM_FUNC_DECL mat(mat<3, 3, T, Q> const & m);
 
 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit mat(ctor);
@@ -53,7 +53,7 @@ namespace glm
 			X2 x2, Y2 y2, Z2 z2,
 			X3 x3, Y3 y3, Z3 z3);
 
-		template <typename V1, typename V2, typename V3>
+		template<typename V1, typename V2, typename V3>
 		GLM_FUNC_DECL mat(
 			vec<3, V1, P> const & v1,
 			vec<3, V2, P> const & v2,
@@ -61,7 +61,7 @@ namespace glm
 
 		// -- Matrix conversions --
 
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 3, U, Q> const & m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, T, P> const & x);
@@ -85,23 +85,23 @@ namespace glm
 
 		GLM_FUNC_DECL mat<3, 3, T, P> & operator=(mat<3, 3, T, P> const & m) GLM_DEFAULT;
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 3, T, P> & operator=(mat<3, 3, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 3, T, P> & operator+=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 3, T, P> & operator+=(mat<3, 3, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 3, T, P> & operator-=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 3, T, P> & operator-=(mat<3, 3, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 3, T, P> & operator*=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 3, T, P> & operator*=(mat<3, 3, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 3, T, P> & operator/=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 3, T, P> & operator/=(mat<3, 3, U, P> const & m);
 
 		// -- Increment and decrement operators --
@@ -114,74 +114,74 @@ namespace glm
 
 	// -- Unary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> operator+(mat<3, 3, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> operator-(mat<3, 3, T, P> const & m);
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> operator+(mat<3, 3, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> operator+(T scalar, mat<3, 3, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> operator+(mat<3, 3, T, P> const & m1, mat<3, 3, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> operator-(mat<3, 3, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> operator-(T scalar, mat<3, 3, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> operator-(mat<3, 3, T, P> const & m1, mat<3, 3, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> operator*(mat<3, 3, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> operator*(T scalar, mat<3, 3, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<3, 3, T, P>::col_type operator*(mat<3, 3, T, P> const & m, typename mat<3, 3, T, P>::row_type const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<3, 3, T, P>::row_type operator*(typename mat<3, 3, T, P>::col_type const & v, mat<3, 3, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> operator*(mat<3, 3, T, P> const & m1, mat<3, 3, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 3, T, P> operator*(mat<3, 3, T, P> const & m1, mat<2, 3, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 3, T, P> operator*(mat<3, 3, T, P> const & m1, mat<4, 3, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> operator/(mat<3, 3, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> operator/(T scalar, mat<3, 3, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<3, 3, T, P>::col_type operator/(mat<3, 3, T, P> const & m, typename mat<3, 3, T, P>::row_type const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<3, 3, T, P>::row_type operator/(typename mat<3, 3, T, P>::col_type const & v, mat<3, 3, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> operator/(mat<3, 3, T, P> const & m1, mat<3, 3, T, P> const & m2);
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator==(mat<3, 3, T, P> const & m1, mat<3, 3, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator!=(mat<3, 3, T, P> const & m1, mat<3, 3, T, P> const & m2);
 }//namespace glm
 
diff --git a/glm/detail/type_mat3x3.inl b/glm/detail/type_mat3x3.inl
index c45d42e9..f4b4ad8e 100644
--- a/glm/detail/type_mat3x3.inl
+++ b/glm/detail/type_mat3x3.inl
@@ -8,7 +8,7 @@ namespace glm
 	// -- Constructors --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<3, 3, T, P>::mat()
 		{
 #			ifndef GLM_FORCE_NO_CTOR_INIT 
@@ -20,7 +20,7 @@ namespace glm
 #	endif
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<3, 3, T, P>::mat(mat<3, 3, T, P> const & m)
 		{
 			this->value[0] = m.value[0];
@@ -29,8 +29,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <precision Q>
+	template<typename T, precision P>
+	template<precision Q>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P>::mat(mat<3, 3, T, Q> const & m)
 	{
 		this->value[0] = m.value[0];
@@ -38,11 +38,11 @@ namespace glm
 		this->value[2] = m.value[2];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR mat<3, 3, T, P>::mat(ctor)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P>::mat(T scalar)
 	{
 		this->value[0] = col_type(scalar, 0, 0);
@@ -50,7 +50,7 @@ namespace glm
 		this->value[2] = col_type(0, 0, scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P>::mat
 	(
 		T x0, T y0, T z0,
@@ -63,7 +63,7 @@ namespace glm
 		this->value[2] = col_type(x2, y2, z2);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P>::mat
 	(
 		col_type const & v0,
@@ -78,8 +78,8 @@ namespace glm
 
 	// -- Conversion constructors --
 
-	template <typename T, precision P>
-	template <
+	template<typename T, precision P>
+	template<
 		typename X1, typename Y1, typename Z1,
 		typename X2, typename Y2, typename Z2,
 		typename X3, typename Y3, typename Z3>
@@ -95,8 +95,8 @@ namespace glm
 		this->value[2] = col_type(static_cast<T>(x3), value_type(y3), value_type(z3));
 	}
 	
-	template <typename T, precision P>
-	template <typename V1, typename V2, typename V3>
+	template<typename T, precision P>
+	template<typename V1, typename V2, typename V3>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P>::mat
 	(
 		vec<3, V1, P> const& v1,
@@ -111,8 +111,8 @@ namespace glm
 
 	// -- Matrix conversions --
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P>::mat(mat<3, 3, U, Q> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -120,7 +120,7 @@ namespace glm
 		this->value[2] = col_type(m[2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P>::mat(mat<2, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
@@ -128,7 +128,7 @@ namespace glm
 		this->value[2] = col_type(0, 0, 1);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P>::mat(mat<4, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -136,7 +136,7 @@ namespace glm
 		this->value[2] = col_type(m[2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P>::mat(mat<2, 3, T, P> const & m)
 	{
 		this->value[0] = m[0];
@@ -144,7 +144,7 @@ namespace glm
 		this->value[2] = col_type(0, 0, 1);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P>::mat(mat<3, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
@@ -152,7 +152,7 @@ namespace glm
 		this->value[2] = col_type(m[2], 1);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P>::mat(mat<2, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -160,7 +160,7 @@ namespace glm
 		this->value[2] = col_type(0, 0, 1);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P>::mat(mat<4, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
@@ -168,7 +168,7 @@ namespace glm
 		this->value[2] = col_type(m[2], 1);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P>::mat(mat<3, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -176,7 +176,7 @@ namespace glm
 		this->value[2] = col_type(m[2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P>::mat(mat<4, 3, T, P> const & m)
 	{
 		this->value[0] = m[0];
@@ -186,14 +186,14 @@ namespace glm
 
 	// -- Accesses --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<3, 3, T, P>::col_type & mat<3, 3, T, P>::operator[](typename mat<3, 3, T, P>::length_type i)
 	{
 		assert(i < this->length());
 		return this->value[i];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<3, 3, T, P>::col_type const & mat<3, 3, T, P>::operator[](typename mat<3, 3, T, P>::length_type i) const
 	{
 		assert(i < this->length());
@@ -203,7 +203,7 @@ namespace glm
 	// -- Unary updatable operators --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<3, 3, T, P> & mat<3, 3, T, P>::operator=(mat<3, 3, T, P> const & m)
 		{
 			this->value[0] = m[0];
@@ -213,8 +213,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> & mat<3, 3, T, P>::operator=(mat<3, 3, U, P> const & m)
 	{
 		this->value[0] = m[0];
@@ -223,8 +223,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> & mat<3, 3, T, P>::operator+=(U s)
 	{
 		this->value[0] += s;
@@ -233,8 +233,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> & mat<3, 3, T, P>::operator+=(mat<3, 3, U, P> const & m)
 	{
 		this->value[0] += m[0];
@@ -243,8 +243,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> & mat<3, 3, T, P>::operator-=(U s)
 	{
 		this->value[0] -= s;
@@ -253,8 +253,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> & mat<3, 3, T, P>::operator-=(mat<3, 3, U, P> const & m)
 	{
 		this->value[0] -= m[0];
@@ -263,8 +263,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> & mat<3, 3, T, P>::operator*=(U s)
 	{
 		this->value[0] *= s;
@@ -273,15 +273,15 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> & mat<3, 3, T, P>::operator*=(mat<3, 3, U, P> const & m)
 	{
 		return (*this = *this * m);
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> & mat<3, 3, T, P>::operator/=(U s)
 	{
 		this->value[0] /= s;
@@ -290,8 +290,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> & mat<3, 3, T, P>::operator/=(mat<3, 3, U, P> const & m)
 	{
 		return *this *= inverse(m);
@@ -299,7 +299,7 @@ namespace glm
 
 	// -- Increment and decrement operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> & mat<3, 3, T, P>::operator++()
 	{
 		++this->value[0];
@@ -308,7 +308,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> & mat<3, 3, T, P>::operator--()
 	{
 		--this->value[0];
@@ -317,7 +317,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> mat<3, 3, T, P>::operator++(int)
 	{
 		mat<3, 3, T, P> Result(*this);
@@ -325,7 +325,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> mat<3, 3, T, P>::operator--(int)
 	{
 		mat<3, 3, T, P> Result(*this);
@@ -335,13 +335,13 @@ namespace glm
 
 	// -- Unary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> operator+(mat<3, 3, T, P> const & m)
 	{
 		return m;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> operator-(mat<3, 3, T, P> const & m)
 	{
 		return mat<3, 3, T, P>(
@@ -352,7 +352,7 @@ namespace glm
 
 	// -- Binary arithmetic operators --
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> operator+(mat<3, 3, T, P> const & m, T scalar)
 	{
 		return mat<3, 3, T, P>(
@@ -361,7 +361,7 @@ namespace glm
 			m[2] + scalar);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> operator+(T scalar, mat<3, 3, T, P> const & m)
 	{
 		return mat<3, 3, T, P>(
@@ -370,7 +370,7 @@ namespace glm
 			m[2] + scalar);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> operator+(mat<3, 3, T, P> const & m1, mat<3, 3, T, P> const & m2)
 	{
 		return mat<3, 3, T, P>(
@@ -379,7 +379,7 @@ namespace glm
 			m1[2] + m2[2]);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> operator-(mat<3, 3, T, P> const & m, T scalar)
 	{
 		return mat<3, 3, T, P>(
@@ -388,7 +388,7 @@ namespace glm
 			m[2] - scalar);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> operator-(T scalar, mat<3, 3, T, P> const & m)
 	{
 		return mat<3, 3, T, P>(
@@ -397,7 +397,7 @@ namespace glm
 			scalar - m[2]);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> operator-(mat<3, 3, T, P> const & m1, mat<3, 3, T, P> const & m2)
 	{
 		return mat<3, 3, T, P>(
@@ -406,7 +406,7 @@ namespace glm
 			m1[2] - m2[2]);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> operator*(mat<3, 3, T, P> const & m, T scalar)
 	{
 		return mat<3, 3, T, P>(
@@ -415,7 +415,7 @@ namespace glm
 			m[2] * scalar);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> operator*(T scalar, mat<3, 3, T, P> const & m)
 	{
 		return mat<3, 3, T, P>(
@@ -424,7 +424,7 @@ namespace glm
 			m[2] * scalar);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER typename mat<3, 3, T, P>::col_type operator*(mat<3, 3, T, P> const & m, typename mat<3, 3, T, P>::row_type const & v)
 	{
 		return typename mat<3, 3, T, P>::col_type(
@@ -433,7 +433,7 @@ namespace glm
 			m[0][2] * v.x + m[1][2] * v.y + m[2][2] * v.z);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER typename mat<3, 3, T, P>::row_type operator*(typename mat<3, 3, T, P>::col_type const & v, mat<3, 3, T, P> const & m)
 	{
 		return typename mat<3, 3, T, P>::row_type(
@@ -442,7 +442,7 @@ namespace glm
 			m[2][0] * v.x + m[2][1] * v.y + m[2][2] * v.z);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> operator*(mat<3, 3, T, P> const & m1, mat<3, 3, T, P> const & m2)
 	{
 		T const SrcA00 = m1[0][0];
@@ -478,7 +478,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> operator*(mat<3, 3, T, P> const & m1, mat<2, 3, T, P> const & m2)
 	{
 		return mat<2, 3, T, P>(
@@ -490,7 +490,7 @@ namespace glm
 			m1[0][2] * m2[1][0] + m1[1][2] * m2[1][1] + m1[2][2] * m2[1][2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> operator*(mat<3, 3, T, P> const & m1, mat<4, 3, T, P> const & m2)
 	{
 		return mat<4, 3, T, P>(
@@ -508,7 +508,7 @@ namespace glm
 			m1[0][2] * m2[3][0] + m1[1][2] * m2[3][1] + m1[2][2] * m2[3][2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> operator/(mat<3, 3, T, P> const & m,	T scalar)
 	{
 		return mat<3, 3, T, P>(
@@ -517,7 +517,7 @@ namespace glm
 			m[2] / scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> operator/(T scalar, mat<3, 3, T, P> const & m)
 	{
 		return mat<3, 3, T, P>(
@@ -526,19 +526,19 @@ namespace glm
 			scalar / m[2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<3, 3, T, P>::col_type operator/(mat<3, 3, T, P> const & m, typename mat<3, 3, T, P>::row_type const & v)
 	{
 		return  inverse(m) * v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<3, 3, T, P>::row_type operator/(typename mat<3, 3, T, P>::col_type const & v, mat<3, 3, T, P> const & m)
 	{
 		return v * inverse(m);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> operator/(mat<3, 3, T, P> const & m1, mat<3, 3, T, P> const & m2)
 	{
 		mat<3, 3, T, P> m1_copy(m1);
@@ -547,13 +547,13 @@ namespace glm
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator==(mat<3, 3, T, P> const & m1, mat<3, 3, T, P> const & m2)
 	{
 		return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator!=(mat<3, 3, T, P> const & m1, mat<3, 3, T, P> const & m2)
 	{
 		return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]);
diff --git a/glm/detail/type_mat3x4.hpp b/glm/detail/type_mat3x4.hpp
index ece282fa..77d2143e 100644
--- a/glm/detail/type_mat3x4.hpp
+++ b/glm/detail/type_mat3x4.hpp
@@ -12,7 +12,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct mat<3, 4, T, P>
 	{
 		typedef vec<4, T, P> col_type;
@@ -29,7 +29,7 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT_CTOR;
 		GLM_FUNC_DECL mat(mat<3, 4, T, P> const & m) GLM_DEFAULT;
-		template <precision Q>
+		template<precision Q>
 		GLM_FUNC_DECL mat(mat<3, 4, T, Q> const & m);
 
 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit mat(ctor);
@@ -54,7 +54,7 @@ namespace glm
 			X2 x2, Y2 y2, Z2 z2, W2 w2,
 			X3 x3, Y3 y3, Z3 z3, W3 w3);
 
-		template <typename V1, typename V2, typename V3>
+		template<typename V1, typename V2, typename V3>
 		GLM_FUNC_DECL mat(
 			vec<4, V1, P> const & v1,
 			vec<4, V2, P> const & v2,
@@ -62,7 +62,7 @@ namespace glm
 
 		// -- Matrix conversions --
 
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<3, 4, U, Q> const & m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, T, P> const & x);
@@ -86,19 +86,19 @@ namespace glm
 
 		GLM_FUNC_DECL mat<3, 4, T, P> & operator=(mat<3, 4, T, P> const & m) GLM_DEFAULT;
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 4, T, P> & operator=(mat<3, 4, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 4, T, P> & operator+=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 4, T, P> & operator+=(mat<3, 4, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 4, T, P> & operator-=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 4, T, P> & operator-=(mat<3, 4, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 4, T, P> & operator*=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<3, 4, T, P> & operator/=(U s);
 
 		// -- Increment and decrement operators --
@@ -111,59 +111,59 @@ namespace glm
 
 	// -- Unary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 4, T, P> operator+(mat<3, 4, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 4, T, P> operator-(mat<3, 4, T, P> const & m);
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 4, T, P> operator+(mat<3, 4, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 4, T, P> operator+(mat<3, 4, T, P> const & m1, mat<3, 4, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 4, T, P> operator-(mat<3, 4, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 4, T, P> operator-(mat<3, 4, T, P> const & m1, mat<3, 4, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 4, T, P> operator*(mat<3, 4, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 4, T, P> operator*(T scalar, mat<3, 4, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<3, 4, T, P>::col_type operator*(mat<3, 4, T, P> const & m, typename mat<3, 4, T, P>::row_type const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<3, 4, T, P>::row_type operator*(typename mat<3, 4, T, P>::col_type const & v, mat<3, 4, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> operator*(mat<3, 4, T, P> const & m1,	mat<4, 3, T, P> const& m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 4, T, P> operator*(mat<3, 4, T, P> const & m1, mat<2, 3, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 4, T, P> operator*(mat<3, 4, T, P> const & m1,	mat<3, 3, T, P> const& m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 4, T, P> operator/(mat<3, 4, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 4, T, P> operator/(T scalar, mat<3, 4, T, P> const & m);
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator==(mat<3, 4, T, P> const & m1, mat<3, 4, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator!=(mat<3, 4, T, P> const & m1, mat<3, 4, T, P> const & m2);
 }//namespace glm
 
diff --git a/glm/detail/type_mat3x4.inl b/glm/detail/type_mat3x4.inl
index eb336fac..73f4aebb 100644
--- a/glm/detail/type_mat3x4.inl
+++ b/glm/detail/type_mat3x4.inl
@@ -6,7 +6,7 @@ namespace glm
 	// -- Constructors --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<3, 4, T, P>::mat()
 		{
 #			ifndef GLM_FORCE_NO_CTOR_INIT 
@@ -18,7 +18,7 @@ namespace glm
 #	endif
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<3, 4, T, P>::mat(mat<3, 4, T, P> const & m)
 		{
 			this->value[0] = m.value[0];
@@ -27,8 +27,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <precision Q>
+	template<typename T, precision P>
+	template<precision Q>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>::mat(mat<3, 4, T, Q> const & m)
 	{
 		this->value[0] = m.value[0];
@@ -36,11 +36,11 @@ namespace glm
 		this->value[2] = m.value[2];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR mat<3, 4, T, P>::mat(ctor)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>::mat(T scalar)
 	{
 		this->value[0] = col_type(scalar, 0, 0, 0);
@@ -48,7 +48,7 @@ namespace glm
 		this->value[2] = col_type(0, 0, scalar, 0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>::mat 
 	(
 		T x0, T y0, T z0, T w0,
@@ -61,7 +61,7 @@ namespace glm
 		this->value[2] = col_type(x2, y2, z2, w2);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>::mat 
 	(
 		col_type const & v0,
@@ -76,8 +76,8 @@ namespace glm
 
 	// -- Conversion constructors --
 
-	template <typename T, precision P>
-	template <
+	template<typename T, precision P>
+	template<
 		typename X1, typename Y1, typename Z1, typename W1,
 		typename X2, typename Y2, typename Z2, typename W2,
 		typename X3, typename Y3, typename Z3, typename W3>
@@ -93,8 +93,8 @@ namespace glm
 		this->value[2] = col_type(static_cast<T>(x3), value_type(y3), value_type(z3), value_type(w3));
 	}
 	
-	template <typename T, precision P>
-	template <typename V1, typename V2, typename V3>
+	template<typename T, precision P>
+	template<typename V1, typename V2, typename V3>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>::mat 
 	(
 		vec<4, V1, P> const & v1,
@@ -109,8 +109,8 @@ namespace glm
 	
 	// -- Matrix conversions --
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>::mat(mat<3, 4, U, Q> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -118,7 +118,7 @@ namespace glm
 		this->value[2] = col_type(m[2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>::mat(mat<2, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0, 0);
@@ -126,7 +126,7 @@ namespace glm
 		this->value[2] = col_type(0, 0, 1, 0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>::mat(mat<3, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
@@ -134,7 +134,7 @@ namespace glm
 		this->value[2] = col_type(m[2], 0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>::mat(mat<4, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -142,7 +142,7 @@ namespace glm
 		this->value[2] = col_type(m[2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>::mat(mat<2, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
@@ -150,7 +150,7 @@ namespace glm
 		this->value[2] = col_type(0, 0, 1, 0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>::mat(mat<3, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0, 0);
@@ -158,7 +158,7 @@ namespace glm
 		this->value[2] = col_type(m[2], 1, 0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>::mat(mat<2, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -166,7 +166,7 @@ namespace glm
 		this->value[2] = col_type(0, 0, 1, 0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>::mat(mat<4, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0, 0);
@@ -174,7 +174,7 @@ namespace glm
 		this->value[2] = col_type(m[2], 1, 0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>::mat(mat<4, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
@@ -184,14 +184,14 @@ namespace glm
 
 	// -- Accesses --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<3, 4, T, P>::col_type & mat<3, 4, T, P>::operator[](typename mat<3, 4, T, P>::length_type i)
 	{
 		assert(i < this->length());
 		return this->value[i];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<3, 4, T, P>::col_type const & mat<3, 4, T, P>::operator[](typename mat<3, 4, T, P>::length_type i) const
 	{
 		assert(i < this->length());
@@ -201,7 +201,7 @@ namespace glm
 	// -- Unary updatable operators --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<3, 4, T, P>& mat<3, 4, T, P>::operator=(mat<3, 4, T, P> const & m)
 		{
 			this->value[0] = m[0];
@@ -211,8 +211,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P> 
-	template <typename U> 
+	template<typename T, precision P> 
+	template<typename U> 
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>& mat<3, 4, T, P>::operator=(mat<3, 4, U, P> const & m)
 	{
 		this->value[0] = m[0];
@@ -221,8 +221,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P> 
-	template <typename U> 
+	template<typename T, precision P> 
+	template<typename U> 
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>& mat<3, 4, T, P>::operator+=(U s)
 	{
 		this->value[0] += s;
@@ -231,8 +231,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P> 
-	template <typename U> 
+	template<typename T, precision P> 
+	template<typename U> 
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>& mat<3, 4, T, P>::operator+=(mat<3, 4, U, P> const & m)
 	{
 		this->value[0] += m[0];
@@ -241,8 +241,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>& mat<3, 4, T, P>::operator-=(U s)
 	{
 		this->value[0] -= s;
@@ -251,8 +251,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>& mat<3, 4, T, P>::operator-=(mat<3, 4, U, P> const & m)
 	{
 		this->value[0] -= m[0];
@@ -261,8 +261,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>& mat<3, 4, T, P>::operator*=(U s)
 	{
 		this->value[0] *= s;
@@ -271,8 +271,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> & mat<3, 4, T, P>::operator/=(U s)
 	{
 		this->value[0] /= s;
@@ -283,7 +283,7 @@ namespace glm
 
 	// -- Increment and decrement operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>& mat<3, 4, T, P>::operator++()
 	{
 		++this->value[0];
@@ -292,7 +292,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P>& mat<3, 4, T, P>::operator--()
 	{
 		--this->value[0];
@@ -301,7 +301,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> mat<3, 4, T, P>::operator++(int)
 	{
 		mat<3, 4, T, P> Result(*this);
@@ -309,7 +309,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> mat<3, 4, T, P>::operator--(int)
 	{
 		mat<3, 4, T, P> Result(*this);
@@ -319,13 +319,13 @@ namespace glm
 
 	// -- Unary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> operator+(mat<3, 4, T, P> const & m)
 	{
 		return m;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> operator-(mat<3, 4, T, P> const & m)
 	{
 		return mat<3, 4, T, P>(
@@ -336,7 +336,7 @@ namespace glm
 
 	// -- Binary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> operator+(mat<3, 4, T, P> const & m, T scalar)
 	{
 		return mat<3, 4, T, P>(
@@ -345,7 +345,7 @@ namespace glm
 			m[2] + scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> operator+(mat<3, 4, T, P> const & m1, mat<3, 4, T, P> const & m2)
 	{
 		return mat<3, 4, T, P>(
@@ -354,7 +354,7 @@ namespace glm
 			m1[2] + m2[2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> operator-(mat<3, 4, T, P> const & m,	T scalar)
 	{
 		return mat<3, 4, T, P>(
@@ -363,7 +363,7 @@ namespace glm
 			m[2] - scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> operator-(mat<3, 4, T, P> const & m1, mat<3, 4, T, P> const & m2)
 	{
 		return mat<3, 4, T, P>(
@@ -372,7 +372,7 @@ namespace glm
 			m1[2] - m2[2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> operator*(mat<3, 4, T, P> const & m, T scalar)
 	{
 		return mat<3, 4, T, P>(
@@ -381,7 +381,7 @@ namespace glm
 			m[2] * scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> operator*(T scalar, mat<3, 4, T, P> const & m)
 	{
 		return mat<3, 4, T, P>(
@@ -390,7 +390,7 @@ namespace glm
 			m[2] * scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<3, 4, T, P>::col_type operator*
 	(
 		mat<3, 4, T, P> const& m,
@@ -404,7 +404,7 @@ namespace glm
 			m[0][3] * v.x + m[1][3] * v.y + m[2][3] * v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<3, 4, T, P>::row_type operator*
 	(
 		typename mat<3, 4, T, P>::col_type const & v,
@@ -417,7 +417,7 @@ namespace glm
 			v.x * m[2][0] + v.y * m[2][1] + v.z * m[2][2] + v.w * m[2][3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> operator*(mat<3, 4, T, P> const & m1, mat<4, 3, T, P> const & m2)
 	{
 		const T SrcA00 = m1[0][0];
@@ -466,7 +466,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> operator*(mat<3, 4, T, P> const & m1, mat<2, 3, T, P> const & m2)
 	{
 		return mat<2, 4, T, P>(
@@ -480,7 +480,7 @@ namespace glm
 			m1[0][3] * m2[1][0] + m1[1][3] * m2[1][1] + m1[2][3] * m2[1][2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> operator*(mat<3, 4, T, P> const & m1, mat<3, 3, T, P> const & m2)
 	{
 		return mat<3, 4, T, P>(
@@ -498,7 +498,7 @@ namespace glm
 			m1[0][3] * m2[2][0] + m1[1][3] * m2[2][1] + m1[2][3] * m2[2][2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> operator/(mat<3, 4, T, P> const & m,	T scalar)
 	{
 		return mat<3, 4, T, P>(
@@ -507,7 +507,7 @@ namespace glm
 			m[2] / scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> operator/(T scalar, mat<3, 4, T, P> const & m)
 	{
 		return mat<3, 4, T, P>(
@@ -518,13 +518,13 @@ namespace glm
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator==(mat<3, 4, T, P> const & m1, mat<3, 4, T, P> const & m2)
 	{
 		return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator!=(mat<3, 4, T, P> const & m1, mat<3, 4, T, P> const & m2)
 	{
 		return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]);
diff --git a/glm/detail/type_mat4x2.hpp b/glm/detail/type_mat4x2.hpp
index d38296a9..feff316e 100644
--- a/glm/detail/type_mat4x2.hpp
+++ b/glm/detail/type_mat4x2.hpp
@@ -12,7 +12,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct mat<4, 2, T, P>
 	{
 		typedef vec<2, T, P> col_type;
@@ -29,7 +29,7 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT_CTOR;
 		GLM_FUNC_DECL mat(mat<4, 2, T, P> const & m) GLM_DEFAULT;
-		template <precision Q>
+		template<precision Q>
 		GLM_FUNC_DECL mat(mat<4, 2, T, Q> const & m);
 
 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit mat(ctor);
@@ -47,7 +47,7 @@ namespace glm
 
 		// -- Conversions --
 
-		template <
+		template<
 			typename X1, typename Y1,
 			typename X2, typename Y2,
 			typename X3, typename Y3,
@@ -58,7 +58,7 @@ namespace glm
 			X3 x3, Y3 y3,
 			X4 x4, Y4 y4);
 
-		template <typename V1, typename V2, typename V3, typename V4>
+		template<typename V1, typename V2, typename V3, typename V4>
 		GLM_FUNC_DECL mat(
 			vec<2, V1, P> const & v1,
 			vec<2, V2, P> const & v2,
@@ -67,7 +67,7 @@ namespace glm
 
 		// -- Matrix conversions --
 
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<4, 2, U, Q> const & m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, T, P> const & x);
@@ -91,19 +91,19 @@ namespace glm
 
 		GLM_FUNC_DECL mat<4, 2, T, P> & operator=(mat<4, 2, T, P> const & m) GLM_DEFAULT;
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 2, T, P> & operator=(mat<4, 2, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 2, T, P> & operator+=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 2, T, P> & operator+=(mat<4, 2, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 2, T, P> & operator-=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 2, T, P> & operator-=(mat<4, 2, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 2, T, P> & operator*=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 2, T, P> & operator/=(U s);
 
 		// -- Increment and decrement operators --
@@ -116,59 +116,59 @@ namespace glm
 
 	// -- Unary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 2, T, P> operator+(mat<4, 2, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 2, T, P> operator-(mat<4, 2, T, P> const & m);
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 2, T, P> operator+(mat<4, 2, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 2, T, P> operator+(mat<4, 2, T, P> const & m1, mat<4, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 2, T, P> operator-(mat<4, 2, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 2, T, P> operator-(mat<4, 2, T, P> const & m1,	mat<4, 2, T, P> const& m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 2, T, P> operator*(mat<4, 2, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 2, T, P> operator*(T scalar, mat<4, 2, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<4, 2, T, P>::col_type operator*(mat<4, 2, T, P> const & m, typename mat<4, 2, T, P>::row_type const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<4, 2, T, P>::row_type operator*(typename mat<4, 2, T, P>::col_type const & v, mat<4, 2, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> operator*(mat<4, 2, T, P> const & m1, mat<2, 4, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 2, T, P> operator*(mat<4, 2, T, P> const & m1, mat<3, 4, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 2, T, P> operator*(mat<4, 2, T, P> const & m1, mat<4, 4, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 2, T, P> operator/(mat<4, 2, T, P> const & m, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 2, T, P> operator/(T scalar, mat<4, 2, T, P> const & m);
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator==(mat<4, 2, T, P> const & m1, mat<4, 2, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator!=(mat<4, 2, T, P> const & m1, mat<4, 2, T, P> const & m2);
 }//namespace glm
 
diff --git a/glm/detail/type_mat4x2.inl b/glm/detail/type_mat4x2.inl
index 12ba828b..68d34630 100644
--- a/glm/detail/type_mat4x2.inl
+++ b/glm/detail/type_mat4x2.inl
@@ -6,7 +6,7 @@ namespace glm
 	// -- Constructors --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-		template <typename T, precision P> 
+		template<typename T, precision P> 
 		GLM_FUNC_QUALIFIER mat<4, 2, T, P>::mat()
 		{
 #			ifndef GLM_FORCE_NO_CTOR_INIT 
@@ -19,7 +19,7 @@ namespace glm
 #	endif
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<4, 2, T, P>::mat(mat<4, 2, T, P> const & m)
 		{
 			this->value[0] = m.value[0];
@@ -29,8 +29,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <precision Q>
+	template<typename T, precision P>
+	template<precision Q>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P>::mat(mat<4, 2, T, Q> const & m)
 	{
 		this->value[0] = m.value[0];
@@ -39,11 +39,11 @@ namespace glm
 		this->value[3] = m.value[3];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR mat<4, 2, T, P>::mat(ctor)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P>::mat(T scalar)
 	{
 		this->value[0] = col_type(scalar, 0);
@@ -52,7 +52,7 @@ namespace glm
 		this->value[3] = col_type(0, 0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P>::mat
 	(
 		T x0, T y0,
@@ -67,7 +67,7 @@ namespace glm
 		this->value[3] = col_type(x3, y3);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P>::mat
 	(
 		col_type const & v0,
@@ -84,8 +84,8 @@ namespace glm
 
 	// -- Conversion constructors --
 
-	template <typename T, precision P>
-	template <
+	template<typename T, precision P>
+	template<
 		typename X1, typename Y1,
 		typename X2, typename Y2,
 		typename X3, typename Y3,
@@ -104,8 +104,8 @@ namespace glm
 		this->value[3] = col_type(static_cast<T>(x4), value_type(y4));
 	}
 	
-	template <typename T, precision P>
-	template <typename V1, typename V2, typename V3, typename V4>
+	template<typename T, precision P>
+	template<typename V1, typename V2, typename V3, typename V4>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P>::mat
 	(
 		vec<2, V1, P> const & v1,
@@ -122,8 +122,8 @@ namespace glm
 
 	// -- Conversion --
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P>::mat(mat<4, 2, U, Q> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -132,7 +132,7 @@ namespace glm
 		this->value[3] = col_type(m[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P>::mat(mat<2, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -141,7 +141,7 @@ namespace glm
 		this->value[3] = col_type(0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P>::mat(mat<3, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -150,7 +150,7 @@ namespace glm
 		this->value[3] = col_type(0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P>::mat(mat<4, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -159,7 +159,7 @@ namespace glm
 		this->value[3] = col_type(m[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P>::mat(mat<2, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -168,7 +168,7 @@ namespace glm
 		this->value[3] = col_type(0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P>::mat(mat<3, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -177,7 +177,7 @@ namespace glm
 		this->value[3] = col_type(0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P>::mat(mat<2, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -186,7 +186,7 @@ namespace glm
 		this->value[3] = col_type(0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P>::mat(mat<4, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -195,7 +195,7 @@ namespace glm
 		this->value[3] = col_type(m[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P>::mat(mat<3, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -206,14 +206,14 @@ namespace glm
 
 	// -- Accesses --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<4, 2, T, P>::col_type & mat<4, 2, T, P>::operator[](typename mat<4, 2, T, P>::length_type i)
 	{
 		assert(i < this->length());
 		return this->value[i];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<4, 2, T, P>::col_type const & mat<4, 2, T, P>::operator[](typename mat<4, 2, T, P>::length_type i) const
 	{
 		assert(i < this->length());
@@ -223,7 +223,7 @@ namespace glm
 	// -- Unary updatable operators --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<4, 2, T, P>& mat<4, 2, T, P>::operator=(mat<4, 2, T, P> const & m)
 		{
 			this->value[0] = m[0];
@@ -234,8 +234,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P>& mat<4, 2, T, P>::operator=(mat<4, 2, U, P> const & m)
 	{
 		this->value[0] = m[0];
@@ -245,8 +245,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> & mat<4, 2, T, P>::operator+=(U s)
 	{
 		this->value[0] += s;
@@ -256,8 +256,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> & mat<4, 2, T, P>::operator+=(mat<4, 2, U, P> const & m)
 	{
 		this->value[0] += m[0];
@@ -267,8 +267,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> & mat<4, 2, T, P>::operator-=(U s)
 	{
 		this->value[0] -= s;
@@ -278,8 +278,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> & mat<4, 2, T, P>::operator-=(mat<4, 2, U, P> const & m)
 	{
 		this->value[0] -= m[0];
@@ -289,8 +289,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> & mat<4, 2, T, P>::operator*=(U s)
 	{
 		this->value[0] *= s;
@@ -300,8 +300,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> & mat<4, 2, T, P>::operator/=(U s)
 	{
 		this->value[0] /= s;
@@ -313,7 +313,7 @@ namespace glm
 
 	// -- Increment and decrement operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> & mat<4, 2, T, P>::operator++()
 	{
 		++this->value[0];
@@ -323,7 +323,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> & mat<4, 2, T, P>::operator--()
 	{
 		--this->value[0];
@@ -333,7 +333,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> mat<4, 2, T, P>::operator++(int)
 	{
 		mat<4, 2, T, P> Result(*this);
@@ -341,7 +341,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> mat<4, 2, T, P>::operator--(int)
 	{
 		mat<4, 2, T, P> Result(*this);
@@ -351,13 +351,13 @@ namespace glm
 
 	// -- Unary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> operator+(mat<4, 2, T, P> const & m)
 	{
 		return m;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> operator-(mat<4, 2, T, P> const & m)
 	{
 		return mat<4, 2, T, P>(
@@ -369,7 +369,7 @@ namespace glm
 
 	// -- Binary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> operator+(mat<4, 2, T, P> const & m, T scalar)
 	{
 		return mat<4, 2, T, P>(
@@ -379,7 +379,7 @@ namespace glm
 			m[3] + scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> operator+(mat<4, 2, T, P> const & m1, mat<4, 2, T, P> const & m2)
 	{
 		return mat<4, 2, T, P>(
@@ -389,7 +389,7 @@ namespace glm
 			m1[3] + m2[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> operator-(mat<4, 2, T, P> const & m, T scalar)
 	{
 		return mat<4, 2, T, P>(
@@ -399,7 +399,7 @@ namespace glm
 			m[3] - scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> operator-(mat<4, 2, T, P> const & m1, mat<4, 2, T, P> const & m2)
 	{
 		return mat<4, 2, T, P>(
@@ -409,7 +409,7 @@ namespace glm
 			m1[3] - m2[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> operator*(mat<4, 2, T, P> const & m, T scalar)
 	{
 		return mat<4, 2, T, P>(
@@ -419,7 +419,7 @@ namespace glm
 			m[3] * scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> operator*(T scalar, mat<4, 2, T, P> const & m)
 	{
 		return mat<4, 2, T, P>(
@@ -429,7 +429,7 @@ namespace glm
 			m[3] * scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<4, 2, T, P>::col_type operator*(mat<4, 2, T, P> const & m, typename mat<4, 2, T, P>::row_type const & v)
 	{
 		return typename mat<4, 2, T, P>::col_type(
@@ -437,7 +437,7 @@ namespace glm
 			m[0][1] * v.x + m[1][1] * v.y + m[2][1] * v.z + m[3][1] * v.w);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<4, 2, T, P>::row_type operator*(typename mat<4, 2, T, P>::col_type const & v, mat<4, 2, T, P> const & m)
 	{
 		return typename mat<4, 2, T, P>::row_type(
@@ -447,7 +447,7 @@ namespace glm
 			v.x * m[3][0] + v.y * m[3][1]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> operator*(mat<4, 2, T, P> const & m1, mat<2, 4, T, P> const & m2)
 	{
 		T const SrcA00 = m1[0][0];
@@ -476,7 +476,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> operator*(mat<4, 2, T, P> const & m1, mat<3, 4, T, P> const & m2)
 	{
 		return mat<3, 2, T, P>(
@@ -488,7 +488,7 @@ namespace glm
 			m1[0][1] * m2[2][0] + m1[1][1] * m2[2][1] + m1[2][1] * m2[2][2] + m1[3][1] * m2[2][3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> operator*(mat<4, 2, T, P> const & m1, mat<4, 4, T, P> const & m2)
 	{
 		return mat<4, 2, T, P>(
@@ -502,7 +502,7 @@ namespace glm
 			m1[0][1] * m2[3][0] + m1[1][1] * m2[3][1] + m1[2][1] * m2[3][2] + m1[3][1] * m2[3][3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> operator/(mat<4, 2, T, P> const & m, T scalar)
 	{
 		return mat<4, 2, T, P>(
@@ -512,7 +512,7 @@ namespace glm
 			m[3] / scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> operator/(T scalar, mat<4, 2, T, P> const & m)
 	{
 		return mat<4, 2, T, P>(
@@ -524,13 +524,13 @@ namespace glm
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator==(mat<4, 2, T, P> const & m1, mat<4, 2, T, P> const & m2)
 	{
 		return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]) && (m1[3] == m2[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator!=(mat<4, 2, T, P> const & m1, mat<4, 2, T, P> const & m2)
 	{
 		return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]) || (m1[3] != m2[3]);
diff --git a/glm/detail/type_mat4x3.hpp b/glm/detail/type_mat4x3.hpp
index d9d61f72..2efa8699 100644
--- a/glm/detail/type_mat4x3.hpp
+++ b/glm/detail/type_mat4x3.hpp
@@ -12,7 +12,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct mat<4, 3, T, P>
 	{
 		typedef vec<3, T, P> col_type;
@@ -29,7 +29,7 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT_CTOR;
 		GLM_FUNC_DECL mat(mat<4, 3, T, P> const & m) GLM_DEFAULT;
-		template <precision Q>
+		template<precision Q>
 		GLM_FUNC_DECL mat(mat<4, 3, T, Q> const & m);
 
 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit mat(ctor);
@@ -47,7 +47,7 @@ namespace glm
 
 		// -- Conversions --
 
-		template <
+		template<
 			typename X1, typename Y1, typename Z1,
 			typename X2, typename Y2, typename Z2,
 			typename X3, typename Y3, typename Z3,
@@ -58,7 +58,7 @@ namespace glm
 			X3 const & x3, Y3 const & y3, Z3 const & z3,
 			X4 const & x4, Y4 const & y4, Z4 const & z4);
 
-		template <typename V1, typename V2, typename V3, typename V4>
+		template<typename V1, typename V2, typename V3, typename V4>
 		GLM_FUNC_DECL mat(
 			vec<3, V1, P> const & v1,
 			vec<3, V2, P> const & v2,
@@ -67,7 +67,7 @@ namespace glm
 
 		// -- Matrix conversions --
 
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<4, 3, U, Q> const & m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, T, P> const & x);
@@ -91,19 +91,19 @@ namespace glm
 
 		GLM_FUNC_DECL mat<4, 3, T, P> & operator=(mat<4, 3, T, P> const & m) GLM_DEFAULT;
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 3, T, P> & operator=(mat<4, 3, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 3, T, P> & operator+=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 3, T, P> & operator+=(mat<4, 3, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 3, T, P> & operator-=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 3, T, P> & operator-=(mat<4, 3, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 3, T, P> & operator*=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 3, T, P> & operator/=(U s);
 
 		// -- Increment and decrement operators --
@@ -116,59 +116,59 @@ namespace glm
 
 	// -- Unary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 3, T, P> operator+(mat<4, 3, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 3, T, P> operator-(mat<4, 3, T, P> const & m);
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 3, T, P> operator+(mat<4, 3, T, P> const & m, T const & s);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 3, T, P> operator+(mat<4, 3, T, P> const & m1, mat<4, 3, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 3, T, P> operator-(mat<4, 3, T, P> const & m, T const & s);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 3, T, P> operator-(mat<4, 3, T, P> const & m1, mat<4, 3, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 3, T, P> operator*(mat<4, 3, T, P> const & m, T const & s);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 3, T, P> operator*(T const & s, mat<4, 3, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<4, 3, T, P>::col_type operator*(mat<4, 3, T, P> const & m, typename mat<4, 3, T, P>::row_type const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<4, 3, T, P>::row_type operator*(typename mat<4, 3, T, P>::col_type const & v, mat<4, 3, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 3, T, P> operator*(mat<4, 3, T, P> const & m1, mat<2, 4, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> operator*(mat<4, 3, T, P> const & m1,	mat<3, 4, T, P> const& m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 3, T, P> operator*(mat<4, 3, T, P> const & m1, mat<4, 4, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 3, T, P> operator/(mat<4, 3, T, P> const & m, T const & s);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 3, T, P> operator/(T const & s, mat<4, 3, T, P> const & m);
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator==(mat<4, 3, T, P> const & m1, mat<4, 3, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator!=(mat<4, 3, T, P> const & m1, mat<4, 3, T, P> const & m2);
 }//namespace glm
 
diff --git a/glm/detail/type_mat4x3.inl b/glm/detail/type_mat4x3.inl
index 8c154df3..b3c8d87e 100644
--- a/glm/detail/type_mat4x3.inl
+++ b/glm/detail/type_mat4x3.inl
@@ -6,7 +6,7 @@ namespace glm
 	// -- Constructors --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<4, 3, T, P>::mat()
 		{
 #			ifndef GLM_FORCE_NO_CTOR_INIT 
@@ -19,7 +19,7 @@ namespace glm
 #	endif
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<4, 3, T, P>::mat(mat<4, 3, T, P> const & m)
 		{
 			this->value[0] = m.value[0];
@@ -29,8 +29,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <precision Q>
+	template<typename T, precision P>
+	template<precision Q>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P>::mat(mat<4, 3, T, Q> const & m)
 	{
 		this->value[0] = m.value[0];
@@ -39,11 +39,11 @@ namespace glm
 		this->value[3] = m.value[3];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR mat<4, 3, T, P>::mat(ctor)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P>::mat(T const & s)
 	{
 		this->value[0] = col_type(s, 0, 0);
@@ -52,7 +52,7 @@ namespace glm
 		this->value[3] = col_type(0, 0, 0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P>::mat
 	(
 		T const & x0, T const & y0, T const & z0,
@@ -67,7 +67,7 @@ namespace glm
 		this->value[3] = col_type(x3, y3, z3);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P>::mat
 	(
 		col_type const & v0,
@@ -84,8 +84,8 @@ namespace glm
 
 	// -- Conversion constructors --
 
-	template <typename T, precision P>
-	template <
+	template<typename T, precision P>
+	template<
 		typename X1, typename Y1, typename Z1,
 		typename X2, typename Y2, typename Z2,
 		typename X3, typename Y3, typename Z3,
@@ -104,8 +104,8 @@ namespace glm
 		this->value[3] = col_type(static_cast<T>(x4), value_type(y4), value_type(z4));
 	}
 	
-	template <typename T, precision P>
-	template <typename V1, typename V2, typename V3, typename V4>
+	template<typename T, precision P>
+	template<typename V1, typename V2, typename V3, typename V4>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P>::mat
 	(
 		vec<3, V1, P> const & v1,
@@ -122,8 +122,8 @@ namespace glm
 
 	// -- Matrix conversions --
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P>::mat(mat<4, 3, U, Q> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -132,7 +132,7 @@ namespace glm
 		this->value[3] = col_type(m[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P>::mat(mat<2, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
@@ -141,7 +141,7 @@ namespace glm
 		this->value[3] = col_type(0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P>::mat(mat<3, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -150,7 +150,7 @@ namespace glm
 		this->value[3] = col_type(0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P>::mat(mat<4, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -159,7 +159,7 @@ namespace glm
 		this->value[3] = col_type(m[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P>::mat(mat<2, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -168,7 +168,7 @@ namespace glm
 		this->value[3] = col_type(0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P>::mat(mat<3, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
@@ -177,7 +177,7 @@ namespace glm
 		this->value[3] = col_type(0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P>::mat(mat<2, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -186,7 +186,7 @@ namespace glm
 		this->value[3] = col_type(0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P>::mat(mat<4, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
@@ -195,7 +195,7 @@ namespace glm
 		this->value[3] = col_type(m[3], 0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P>::mat(mat<3, 4, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0]);
@@ -206,14 +206,14 @@ namespace glm
 
 	// -- Accesses --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<4, 3, T, P>::col_type & mat<4, 3, T, P>::operator[](typename mat<4, 3, T, P>::length_type i)
 	{
 		assert(i < this->length());
 		return this->value[i];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<4, 3, T, P>::col_type const & mat<4, 3, T, P>::operator[](typename mat<4, 3, T, P>::length_type i) const
 	{
 		assert(i < this->length());
@@ -223,7 +223,7 @@ namespace glm
 	// -- Unary updatable operators --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<4, 3, T, P>& mat<4, 3, T, P>::operator=(mat<4, 3, T, P> const & m)
 		{
 			this->value[0] = m[0];
@@ -234,8 +234,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P>& mat<4, 3, T, P>::operator=(mat<4, 3, U, P> const & m)
 	{
 		this->value[0] = m[0];
@@ -245,8 +245,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> & mat<4, 3, T, P>::operator+=(U s)
 	{
 		this->value[0] += s;
@@ -256,8 +256,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> & mat<4, 3, T, P>::operator+=(mat<4, 3, U, P> const & m)
 	{
 		this->value[0] += m[0];
@@ -267,8 +267,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> & mat<4, 3, T, P>::operator-=(U s)
 	{
 		this->value[0] -= s;
@@ -278,8 +278,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> & mat<4, 3, T, P>::operator-=(mat<4, 3, U, P> const & m)
 	{
 		this->value[0] -= m[0];
@@ -289,8 +289,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> & mat<4, 3, T, P>::operator*=(U s)
 	{
 		this->value[0] *= s;
@@ -300,8 +300,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> & mat<4, 3, T, P>::operator/=(U s)
 	{
 		this->value[0] /= s;
@@ -313,7 +313,7 @@ namespace glm
 
 	// -- Increment and decrement operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> & mat<4, 3, T, P>::operator++()
 	{
 		++this->value[0];
@@ -323,7 +323,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> & mat<4, 3, T, P>::operator--()
 	{
 		--this->value[0];
@@ -333,7 +333,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> mat<4, 3, T, P>::operator++(int)
 	{
 		mat<4, 3, T, P> Result(*this);
@@ -341,7 +341,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> mat<4, 3, T, P>::operator--(int)
 	{
 		mat<4, 3, T, P> Result(*this);
@@ -351,13 +351,13 @@ namespace glm
 
 	// -- Unary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> operator+(mat<4, 3, T, P> const & m)
 	{
 		return m;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> operator-(mat<4, 3, T, P> const & m)
 	{
 		return mat<4, 3, T, P>(
@@ -369,7 +369,7 @@ namespace glm
 
 	// -- Binary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> operator+(mat<4, 3, T, P> const & m, T const & s)
 	{
 		return mat<4, 3, T, P>(
@@ -379,7 +379,7 @@ namespace glm
 			m[3] + s);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> operator+(mat<4, 3, T, P> const & m1, mat<4, 3, T, P> const & m2)
 	{
 		return mat<4, 3, T, P>(
@@ -389,7 +389,7 @@ namespace glm
 			m1[3] + m2[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> operator-(mat<4, 3, T, P> const & m, T const & s)
 	{
 		return mat<4, 3, T, P>(
@@ -399,7 +399,7 @@ namespace glm
 			m[3] - s);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> operator-(mat<4, 3, T, P> const & m1, mat<4, 3, T, P> const & m2)
 	{
 		return mat<4, 3, T, P>(
@@ -409,7 +409,7 @@ namespace glm
 			m1[3] - m2[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> operator*(mat<4, 3, T, P> const & m, T const & s)
 	{
 		return mat<4, 3, T, P>(
@@ -419,7 +419,7 @@ namespace glm
 			m[3] * s);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> operator*(T const & s, mat<4, 3, T, P> const & m)
 	{
 		return mat<4, 3, T, P>(
@@ -429,7 +429,7 @@ namespace glm
 			m[3] * s);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<4, 3, T, P>::col_type operator*
 	(
 		mat<4, 3, T, P> const& m,
@@ -441,7 +441,7 @@ namespace glm
 			m[0][2] * v.x + m[1][2] * v.y + m[2][2] * v.z + m[3][2] * v.w);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<4, 3, T, P>::row_type operator*
 	(
 		typename mat<4, 3, T, P>::col_type const & v,
@@ -454,7 +454,7 @@ namespace glm
 			v.x * m[3][0] + v.y * m[3][1] + v.z * m[3][2]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> operator*(mat<4, 3, T, P> const & m1, mat<2, 4, T, P> const & m2)
 	{
 		return mat<2, 3, T, P>(
@@ -466,7 +466,7 @@ namespace glm
 			m1[0][2] * m2[1][0] + m1[1][2] * m2[1][1] + m1[2][2] * m2[1][2] + m1[3][2] * m2[1][3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> operator*(mat<4, 3, T, P> const & m1, mat<3, 4, T, P> const & m2)
 	{
 		T const SrcA00 = m1[0][0];
@@ -508,7 +508,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> operator*(mat<4, 3, T, P> const & m1, mat<4, 4, T, P> const & m2)
 	{
 		return mat<4, 3, T, P>(
@@ -526,7 +526,7 @@ namespace glm
 			m1[0][2] * m2[3][0] + m1[1][2] * m2[3][1] + m1[2][2] * m2[3][2] + m1[3][2] * m2[3][3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> operator/(mat<4, 3, T, P> const & m, T const & s)
 	{
 		return mat<4, 3, T, P>(
@@ -536,7 +536,7 @@ namespace glm
 			m[3] / s);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> operator/(T const & s, mat<4, 3, T, P> const & m)
 	{
 		return mat<4, 3, T, P>(
@@ -548,13 +548,13 @@ namespace glm
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator==(mat<4, 3, T, P> const & m1, mat<4, 3, T, P> const & m2)
 	{
 		return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]) && (m1[3] == m2[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator!=(mat<4, 3, T, P> const & m1, mat<4, 3, T, P> const & m2)
 	{
 		return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]) || (m1[3] != m2[3]);
diff --git a/glm/detail/type_mat4x4.hpp b/glm/detail/type_mat4x4.hpp
index f2ad29fe..e0d109ac 100644
--- a/glm/detail/type_mat4x4.hpp
+++ b/glm/detail/type_mat4x4.hpp
@@ -11,7 +11,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct mat<4, 4, T, P>
 	{
 		typedef vec<4, T, P> col_type;
@@ -36,7 +36,7 @@ namespace glm
 
 		GLM_FUNC_DECL mat() GLM_DEFAULT_CTOR;
 		GLM_FUNC_DECL mat(mat<4, 4, T, P> const& m) GLM_DEFAULT;
-		template <precision Q>
+		template<precision Q>
 		GLM_FUNC_DECL mat(mat<4, 4, T, Q> const& m);
 
 		GLM_FUNC_DECL explicit mat(ctor);
@@ -54,7 +54,7 @@ namespace glm
 
 		// -- Conversions --
 
-		template <
+		template<
 			typename X1, typename Y1, typename Z1, typename W1,
 			typename X2, typename Y2, typename Z2, typename W2,
 			typename X3, typename Y3, typename Z3, typename W3,
@@ -65,7 +65,7 @@ namespace glm
 			X3 const & x3, Y3 const & y3, Z3 const & z3, W3 const & w3,
 			X4 const & x4, Y4 const & y4, Z4 const & z4, W4 const & w4);
 
-		template <typename V1, typename V2, typename V3, typename V4>
+		template<typename V1, typename V2, typename V3, typename V4>
 		GLM_FUNC_DECL mat(
 			vec<4, V1, P> const & v1,
 			vec<4, V2, P> const & v2,
@@ -74,7 +74,7 @@ namespace glm
 
 		// -- Matrix conversions --
 
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<4, 4, U, Q> const & m);
 
 		GLM_FUNC_DECL GLM_EXPLICIT mat(mat<2, 2, T, P> const & x);
@@ -90,23 +90,23 @@ namespace glm
 
 		GLM_FUNC_DECL mat<4, 4, T, P> & operator=(mat<4, 4, T, P> const & m) GLM_DEFAULT;
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 4, T, P> & operator=(mat<4, 4, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 4, T, P> & operator+=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 4, T, P> & operator+=(mat<4, 4, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 4, T, P> & operator-=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 4, T, P> & operator-=(mat<4, 4, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 4, T, P> & operator*=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 4, T, P> & operator*=(mat<4, 4, U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 4, T, P> & operator/=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL mat<4, 4, T, P> & operator/=(mat<4, 4, U, P> const & m);
 
 		// -- Increment and decrement operators --
@@ -119,74 +119,74 @@ namespace glm
 
 	// -- Unary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> operator+(mat<4, 4, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> operator-(mat<4, 4, T, P> const & m);
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> operator+(mat<4, 4, T, P> const & m, T const & s);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> operator+(T const & s, mat<4, 4, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> operator+(mat<4, 4, T, P> const & m1, mat<4, 4, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> operator-(mat<4, 4, T, P> const & m, T const & s);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> operator-(T const & s, mat<4, 4, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> operator-(mat<4, 4, T, P> const & m1,	mat<4, 4, T, P> const& m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> operator*(mat<4, 4, T, P> const & m, T const & s);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> operator*(T const & s, mat<4, 4, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<4, 4, T, P>::col_type operator*(mat<4, 4, T, P> const & m, typename mat<4, 4, T, P>::row_type const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<4, 4, T, P>::row_type operator*(typename mat<4, 4, T, P>::col_type const & v, mat<4, 4, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 4, T, P> operator*(mat<4, 4, T, P> const & m1, mat<2, 4, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 4, T, P> operator*(mat<4, 4, T, P> const & m1, mat<3, 4, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> operator*(mat<4, 4, T, P> const & m1, mat<4, 4, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> operator/(mat<4, 4, T, P> const & m, T const & s);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> operator/(T const & s, mat<4, 4, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<4, 4, T, P>::col_type operator/(mat<4, 4, T, P> const & m, typename mat<4, 4, T, P>::row_type const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL typename mat<4, 4, T, P>::row_type operator/(typename mat<4, 4, T, P>::col_type const & v, mat<4, 4, T, P> const & m);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> operator/(mat<4, 4, T, P> const & m1,	mat<4, 4, T, P> const& m2);
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator==(mat<4, 4, T, P> const & m1, mat<4, 4, T, P> const & m2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator!=(mat<4, 4, T, P> const & m1, mat<4, 4, T, P> const & m2);
 }//namespace glm
 
diff --git a/glm/detail/type_mat4x4.inl b/glm/detail/type_mat4x4.inl
index e6b8499f..880ce931 100644
--- a/glm/detail/type_mat4x4.inl
+++ b/glm/detail/type_mat4x4.inl
@@ -8,7 +8,7 @@ namespace glm
 	// -- Constructors --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat()
 		{
 #			ifndef GLM_FORCE_NO_CTOR_INIT 
@@ -21,7 +21,7 @@ namespace glm
 #	endif
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat(mat<4, 4, T, P> const & m)
 		{
 			this->value[0] = m[0];
@@ -31,8 +31,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <precision Q>
+	template<typename T, precision P>
+	template<precision Q>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat(mat<4, 4, T, Q> const & m)
 	{
 		this->value[0] = m[0];
@@ -41,11 +41,11 @@ namespace glm
 		this->value[3] = m[3];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat(ctor)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat(T const & s)
 	{
 		this->value[0] = col_type(s, 0, 0, 0);
@@ -54,7 +54,7 @@ namespace glm
 		this->value[3] = col_type(0, 0, 0, s);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat
 	(
 		T const & x0, T const & y0, T const & z0, T const & w0,
@@ -69,7 +69,7 @@ namespace glm
 		this->value[3] = col_type(x3, y3, z3, w3);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat
 	(
 		col_type const & v0,
@@ -84,8 +84,8 @@ namespace glm
 		this->value[3] = v3;
 	}
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat
 	(
 		mat<4, 4, U, Q> const & m
@@ -99,8 +99,8 @@ namespace glm
 
 	// -- Conversions --
 
-	template <typename T, precision P> 
-	template <
+	template<typename T, precision P> 
+	template<
 		typename X1, typename Y1, typename Z1, typename W1,
 		typename X2, typename Y2, typename Z2, typename W2,
 		typename X3, typename Y3, typename Z3, typename W3,
@@ -139,8 +139,8 @@ namespace glm
 		this->value[3] = col_type(static_cast<T>(x4), value_type(y4), value_type(z4), value_type(w4));
 	}
 	
-	template <typename T, precision P>
-	template <typename V1, typename V2, typename V3, typename V4>
+	template<typename T, precision P>
+	template<typename V1, typename V2, typename V3, typename V4>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat
 	(
 		vec<4, V1, P> const & v1,
@@ -162,7 +162,7 @@ namespace glm
 
 	// -- Matrix conversions --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat(mat<2, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0, 0);
@@ -171,7 +171,7 @@ namespace glm
 		this->value[3] = col_type(0, 0, 0, 1);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat(mat<3, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
@@ -180,7 +180,7 @@ namespace glm
 		this->value[3] = col_type(0, 0, 0, 1);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat(mat<2, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
@@ -189,7 +189,7 @@ namespace glm
 		this->value[3] = col_type(0, 0, 0, 1);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat(mat<3, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0, 0);
@@ -198,7 +198,7 @@ namespace glm
 		this->value[3] = col_type(0, 0, 0, 1);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat(mat<2, 4, T, P> const & m)
 	{
 		this->value[0] = m[0];
@@ -207,7 +207,7 @@ namespace glm
 		this->value[3] = col_type(0, 0, 0, 1);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat(mat<4, 2, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0, 0);
@@ -216,7 +216,7 @@ namespace glm
 		this->value[3] = col_type(0, 0, 0, 1);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat(mat<3, 4, T, P> const & m)
 	{
 		this->value[0] = m[0];
@@ -225,7 +225,7 @@ namespace glm
 		this->value[3] = col_type(0, 0, 0, 1);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>::mat(mat<4, 3, T, P> const & m)
 	{
 		this->value[0] = col_type(m[0], 0);
@@ -236,14 +236,14 @@ namespace glm
 
 	// -- Accesses --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<4, 4, T, P>::col_type & mat<4, 4, T, P>::operator[](typename mat<4, 4, T, P>::length_type i)
 	{
 		assert(i < this->length());
 		return this->value[i];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<4, 4, T, P>::col_type const & mat<4, 4, T, P>::operator[](typename mat<4, 4, T, P>::length_type i) const
 	{
 		assert(i < this->length());
@@ -253,7 +253,7 @@ namespace glm
 	// -- Unary arithmetic operators --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER mat<4, 4, T, P>& mat<4, 4, T, P>::operator=(mat<4, 4, T, P> const & m)
 		{
 			//memcpy could be faster
@@ -266,8 +266,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P> 
-	template <typename U> 
+	template<typename T, precision P> 
+	template<typename U> 
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>& mat<4, 4, T, P>::operator=(mat<4, 4, U, P> const & m)
 	{
 		//memcpy could be faster
@@ -279,8 +279,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>& mat<4, 4, T, P>::operator+=(U s)
 	{
 		this->value[0] += s;
@@ -290,8 +290,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P>& mat<4, 4, T, P>::operator+=(mat<4, 4, U, P> const & m)
 	{
 		this->value[0] += m[0];
@@ -301,8 +301,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> & mat<4, 4, T, P>::operator-=(U s)
 	{
 		this->value[0] -= s;
@@ -312,8 +312,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> & mat<4, 4, T, P>::operator-=(mat<4, 4, U, P> const & m)
 	{
 		this->value[0] -= m[0];
@@ -323,8 +323,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> & mat<4, 4, T, P>::operator*=(U s)
 	{
 		this->value[0] *= s;
@@ -334,15 +334,15 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> & mat<4, 4, T, P>::operator*=(mat<4, 4, U, P> const & m)
 	{
 		return (*this = *this * m);
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> & mat<4, 4, T, P>::operator/=(U s)
 	{
 		this->value[0] /= s;
@@ -352,8 +352,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> & mat<4, 4, T, P>::operator/=(mat<4, 4, U, P> const & m)
 	{
 		return *this *= inverse(m);
@@ -361,7 +361,7 @@ namespace glm
 
 	// -- Increment and decrement operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> & mat<4, 4, T, P>::operator++()
 	{
 		++this->value[0];
@@ -371,7 +371,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> & mat<4, 4, T, P>::operator--()
 	{
 		--this->value[0];
@@ -381,7 +381,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> mat<4, 4, T, P>::operator++(int)
 	{
 		mat<4, 4, T, P> Result(*this);
@@ -389,7 +389,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> mat<4, 4, T, P>::operator--(int)
 	{
 		mat<4, 4, T, P> Result(*this);
@@ -399,13 +399,13 @@ namespace glm
 
 	// -- Unary constant operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> operator+(mat<4, 4, T, P> const & m)
 	{
 		return m;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> operator-(mat<4, 4, T, P> const & m)
 	{
 		return mat<4, 4, T, P>(
@@ -417,7 +417,7 @@ namespace glm
 
 	// -- Binary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> operator+(mat<4, 4, T, P> const & m, T const & s)
 	{
 		return mat<4, 4, T, P>(
@@ -427,7 +427,7 @@ namespace glm
 			m[3] + s);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> operator+(T const & s, mat<4, 4, T, P> const & m)
 	{
 		return mat<4, 4, T, P>(
@@ -437,7 +437,7 @@ namespace glm
 			m[3] + s);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> operator+(mat<4, 4, T, P> const & m1, mat<4, 4, T, P> const & m2)
 	{
 		return mat<4, 4, T, P>(
@@ -447,7 +447,7 @@ namespace glm
 			m1[3] + m2[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> operator-(mat<4, 4, T, P> const & m, T const & s)
 	{
 		return mat<4, 4, T, P>(
@@ -457,7 +457,7 @@ namespace glm
 			m[3] - s);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> operator-(T const & s, mat<4, 4, T, P> const & m)
 	{
 		return mat<4, 4, T, P>(
@@ -467,7 +467,7 @@ namespace glm
 			s - m[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> operator-(mat<4, 4, T, P> const & m1, mat<4, 4, T, P> const & m2)
 	{
 		return mat<4, 4, T, P>(
@@ -477,7 +477,7 @@ namespace glm
 			m1[3] - m2[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> operator*(mat<4, 4, T, P> const & m, T const  & s)
 	{
 		return mat<4, 4, T, P>(
@@ -487,7 +487,7 @@ namespace glm
 			m[3] * s);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> operator*(T const & s, mat<4, 4, T, P> const & m)
 	{
 		return mat<4, 4, T, P>(
@@ -497,7 +497,7 @@ namespace glm
 			m[3] * s);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<4, 4, T, P>::col_type operator*
 	(
 		mat<4, 4, T, P> const& m,
@@ -545,7 +545,7 @@ namespace glm
 */
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<4, 4, T, P>::row_type operator*
 	(
 		typename mat<4, 4, T, P>::col_type const & v,
@@ -559,7 +559,7 @@ namespace glm
 			m[3][0] * v[0] + m[3][1] * v[1] + m[3][2] * v[2] + m[3][3] * v[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> operator*(mat<4, 4, T, P> const & m1, mat<2, 4, T, P> const & m2)
 	{
 		return mat<2, 4, T, P>(
@@ -573,7 +573,7 @@ namespace glm
 			m1[0][3] * m2[1][0] + m1[1][3] * m2[1][1] + m1[2][3] * m2[1][2] + m1[3][3] * m2[1][3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> operator*(mat<4, 4, T, P> const & m1, mat<3, 4, T, P> const & m2)
 	{
 		return mat<3, 4, T, P>(
@@ -591,7 +591,7 @@ namespace glm
 			m1[0][3] * m2[2][0] + m1[1][3] * m2[2][1] + m1[2][3] * m2[2][2] + m1[3][3] * m2[2][3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> operator*(mat<4, 4, T, P> const & m1, mat<4, 4, T, P> const & m2)
 	{
 		typename mat<4, 4, T, P>::col_type const SrcA0 = m1[0];
@@ -612,7 +612,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> operator/(mat<4, 4, T, P> const & m, T const & s)
 	{
 		return mat<4, 4, T, P>(
@@ -622,7 +622,7 @@ namespace glm
 			m[3] / s);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> operator/(T const & s,	mat<4, 4, T, P> const& m)
 	{
 		return mat<4, 4, T, P>(
@@ -632,19 +632,19 @@ namespace glm
 			s / m[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<4, 4, T, P>::col_type operator/(mat<4, 4, T, P> const & m, typename mat<4, 4, T, P>::row_type const & v)
 	{
 		return inverse(m) * v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename mat<4, 4, T, P>::row_type operator/(typename mat<4, 4, T, P>::col_type const & v, mat<4, 4, T, P> const & m)
 	{
 		return v * inverse(m);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> operator/(mat<4, 4, T, P> const & m1, mat<4, 4, T, P> const & m2)
 	{
 		mat<4, 4, T, P> m1_copy(m1);
@@ -653,13 +653,13 @@ namespace glm
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator==(mat<4, 4, T, P> const & m1, mat<4, 4, T, P> const & m2)
 	{
 		return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]) && (m1[3] == m2[3]);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator!=(mat<4, 4, T, P> const & m1, mat<4, 4, T, P> const & m2)
 	{
 		return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]) || (m1[3] != m2[3]);
diff --git a/glm/detail/type_vec.hpp b/glm/detail/type_vec.hpp
index 8b868f4e..c45a25e5 100644
--- a/glm/detail/type_vec.hpp
+++ b/glm/detail/type_vec.hpp
@@ -9,7 +9,7 @@
 namespace glm{
 namespace detail
 {
-	template <typename T, std::size_t size, bool aligned>
+	template<typename T, std::size_t size, bool aligned>
 	struct storage
 	{
 		typedef struct type {
@@ -18,7 +18,7 @@ namespace detail
 	};
 
 	#define GLM_ALIGNED_STORAGE_TYPE_STRUCT(x) \
-		template <typename T> \
+		template<typename T> \
 		struct storage<T, x, true> { \
 			GLM_ALIGNED_STRUCT(x) type { \
 				uint8 data[x]; \
@@ -34,19 +34,19 @@ namespace detail
 	GLM_ALIGNED_STORAGE_TYPE_STRUCT(64)
 		
 #	if GLM_ARCH & GLM_ARCH_SSE2_BIT
-		template <>
+		template<>
 		struct storage<float, 16, true>
 		{
 			typedef glm_vec4 type;
 		};
 
-		template <>
+		template<>
 		struct storage<int, 16, true>
 		{
 			typedef glm_ivec4 type;
 		};
 
-		template <>
+		template<>
 		struct storage<unsigned int, 16, true>
 		{
 			typedef glm_uvec4 type;
@@ -58,19 +58,19 @@ namespace detail
 			unsigned __int8 data[16];
 		} glm_128;
 
-		template <>
+		template<>
 		struct storage<float, 16, true>
 		{
 			typedef glm_128 type;
 		};
 
-		template <>
+		template<>
 		struct storage<int, 16, true>
 		{
 			typedef glm_128 type;
 		};
 
-		template <>
+		template<>
 		struct storage<unsigned int, 16, true>
 		{
 			typedef glm_128 type;
@@ -79,7 +79,7 @@ namespace detail
 #	endif
 
 #	if (GLM_ARCH & GLM_ARCH_AVX_BIT)
-		template <>
+		template<>
 		struct storage<double, 32, true>
 		{
 			typedef glm_dvec4 type;
@@ -87,13 +87,13 @@ namespace detail
 #	endif
 
 #	if (GLM_ARCH & GLM_ARCH_AVX2_BIT)
-		template <>
+		template<>
 		struct storage<int64, 32, true>
 		{
 			typedef glm_i64vec4 type;
 		};
 
-		template <>
+		template<>
 		struct storage<uint64, 32, true>
 		{
 			typedef glm_u64vec4 type;
diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp
index ddd3c210..b80aacf1 100644
--- a/glm/detail/type_vec1.hpp
+++ b/glm/detail/type_vec1.hpp
@@ -16,7 +16,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct vec<1, T, P>
 	{
 		// -- Implementation detail --
@@ -84,7 +84,7 @@ namespace glm
 
 		GLM_FUNC_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR;
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec const & v) GLM_DEFAULT;
-		template <precision Q>
+		template<precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<1, T, Q> const & v);
 
 		// -- Explicit basic constructors --
@@ -95,23 +95,23 @@ namespace glm
 		// -- Conversion vector constructors --
 
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<2, U, Q> const & v);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<3, U, Q> const & v);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<4, U, Q> const & v);
 
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<1, U, Q> const & v);
 
 		// -- Swizzle constructors --
 /*
 #		if(GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED))
-			template <int E0>
+			template<int E0>
 			GLM_FUNC_DECL tvec(detail::_swizzle<1, T, P, tvec1, E0, -1,-2,-3> const & that)
 			{
 				*this = that();
@@ -122,23 +122,23 @@ namespace glm
 
 		GLM_FUNC_DECL vec & operator=(vec const & v) GLM_DEFAULT;
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator+=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator+=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator-=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator-=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator*=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator*=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator/=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator/=(vec<1, U, P> const & v);
 
 		// -- Increment and decrement operators --
@@ -150,147 +150,147 @@ namespace glm
 
 		// -- Unary bit operators --
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator%=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator%=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator&=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator&=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator|=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator|=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator^=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator^=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator<<=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator<<=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator>>=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator>>=(vec<1, U, P> const & v);
 	};
 
 	// -- Unary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator+(vec<1, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator-(vec<1, T, P> const & v);
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator+(vec<1, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator+(T scalar, vec<1, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator+(vec<1, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator-(vec<1, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator-(T scalar, vec<1, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator-	(vec<1, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator*(vec<1, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator*(T scalar, vec<1, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator*(vec<1, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator/(vec<1, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator/(T scalar, vec<1, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator/(vec<1, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator%(vec<1, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator%(T scalar, vec<1, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator%(vec<1, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator&(vec<1, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator&(T scalar, vec<1, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator&(vec<1, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator|(vec<1, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator|(T scalar, vec<1, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator|(vec<1, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator^(vec<1, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator^(T scalar, vec<1, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator^(vec<1, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator<<(vec<1, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator<<(T scalar, vec<1, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator<<(vec<1, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator>>(vec<1, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator>>(T scalar, vec<1, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator>>(vec<1, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<1, T, P> operator~(vec<1, T, P> const & v);
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator==(vec<1, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator!=(vec<1, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <precision P>
+	template<precision P>
 	GLM_FUNC_DECL vec<1, bool, P> operator&&(vec<1, bool, P> const & v1, vec<1, bool, P> const & v2);
 
-	template <precision P>
+	template<precision P>
 	GLM_FUNC_DECL vec<1, bool, P> operator||(vec<1, bool, P> const & v1, vec<1, bool, P> const & v2);
 }//namespace glm
 
diff --git a/glm/detail/type_vec1.inl b/glm/detail/type_vec1.inl
index 8400db20..26a45856 100644
--- a/glm/detail/type_vec1.inl
+++ b/glm/detail/type_vec1.inl
@@ -6,7 +6,7 @@ namespace glm
 	// -- Implicit basic constructors --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, P>::vec()
 #			ifndef GLM_FORCE_NO_CTOR_INIT
 				: x(0)
@@ -15,65 +15,65 @@ namespace glm
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, P>::vec(vec<1, T, P> const & v)
 			: x(v.x)
 		{}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <precision Q>
+	template<typename T, precision P>
+	template<precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, P>::vec(vec<1, T, Q> const & v)
 		: x(v.x)
 	{}
 
 	// -- Explicit basic constructors --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR vec<1, T, P>::vec(ctor)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, P>::vec(T scalar)
 		: x(scalar)
 	{}
 
 	// -- Conversion vector constructors --
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, P>::vec(vec<1, U, Q> const & v)
 		: x(static_cast<T>(v.x))
 	{}
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, P>::vec(vec<2, U, Q> const & v)
 		: x(static_cast<T>(v.x))
 	{}
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, P>::vec(vec<3, U, Q> const & v)
 		: x(static_cast<T>(v.x))
 	{}
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, P>::vec(vec<4, U, Q> const & v)
 		: x(static_cast<T>(v.x))
 	{}
 
 	// -- Component accesses --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T & vec<1, T, P>::operator[](typename vec<1, T, P>::length_type i)
 	{
 		assert(i >= 0 && i < this->length());
 		return (&x)[i];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T const & vec<1, T, P>::operator[](typename vec<1, T, P>::length_type i) const
 	{
 		assert(i >= 0 && i < this->length());
@@ -83,7 +83,7 @@ namespace glm
 	// -- Unary arithmetic operators --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator=(vec<1, T, P> const & v)
 		{
 			this->x = v.x;
@@ -91,72 +91,72 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator=(vec<1, U, P> const & v)
 	{
 		this->x = static_cast<T>(v.x);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator+=(U scalar)
 	{
 		this->x += static_cast<T>(scalar);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator+=(vec<1, U, P> const & v)
 	{
 		this->x += static_cast<T>(v.x);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator-=(U scalar)
 	{
 		this->x -= static_cast<T>(scalar);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator-=(vec<1, U, P> const & v)
 	{
 		this->x -= static_cast<T>(v.x);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator*=(U scalar)
 	{
 		this->x *= static_cast<T>(scalar);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator*=(vec<1, U, P> const & v)
 	{
 		this->x *= static_cast<T>(v.x);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator/=(U scalar)
 	{
 		this->x /= static_cast<T>(scalar);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator/=(vec<1, U, P> const & v)
 	{
 		this->x /= static_cast<T>(v.x);
@@ -165,21 +165,21 @@ namespace glm
 
 	// -- Increment and decrement operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator++()
 	{
 		++this->x;
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator--()
 	{
 		--this->x;
 		return *this;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> vec<1, T, P>::operator++(int)
 	{
 		vec<1, T, P> Result(*this);
@@ -187,7 +187,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> vec<1, T, P>::operator--(int)
 	{
 		vec<1, T, P> Result(*this);
@@ -197,96 +197,96 @@ namespace glm
 
 	// -- Unary bit operators --
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator%=(U scalar)
 	{
 		this->x %= static_cast<T>(scalar);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator%=(vec<1, U, P> const & v)
 	{
 		this->x %= static_cast<T>(v.x);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator&=(U scalar)
 	{
 		this->x &= static_cast<T>(scalar);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator&=(vec<1, U, P> const & v)
 	{
 		this->x &= static_cast<T>(v.x);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator|=(U scalar)
 	{
 		this->x |= static_cast<T>(scalar);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator|=(vec<1, U, P> const & v)
 	{
 		this->x |= U(v.x);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator^=(U scalar)
 	{
 		this->x ^= static_cast<T>(scalar);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator^=(vec<1, U, P> const & v)
 	{
 		this->x ^= static_cast<T>(v.x);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator<<=(U scalar)
 	{
 		this->x <<= static_cast<T>(scalar);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator<<=(vec<1, U, P> const & v)
 	{
 		this->x <<= static_cast<T>(v.x);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator>>=(U scalar)
 	{
 		this->x >>= static_cast<T>(scalar);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> & vec<1, T, P>::operator>>=(vec<1, U, P> const & v)
 	{
 		this->x >>= static_cast<T>(v.x);
@@ -295,13 +295,13 @@ namespace glm
 
 	// -- Unary constant operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator+(vec<1, T, P> const & v)
 	{
 		return v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator-(vec<1, T, P> const & v)
 	{
 		return vec<1, T, P>(
@@ -310,21 +310,21 @@ namespace glm
 
 	// -- Binary arithmetic operators --
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator+(vec<1, T, P> const & v, T scalar)
 	{
 		return vec<1, T, P>(
 			v.x + scalar);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator+(T scalar, vec<1, T, P> const & v)
 	{
 		return vec<1, T, P>(
 			scalar + v.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator+(vec<1, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<1, T, P>(
@@ -332,63 +332,63 @@ namespace glm
 	}
 
 	//operator-
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator-(vec<1, T, P> const & v, T scalar)
 	{
 		return vec<1, T, P>(
 			v.x - scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator-(T scalar, vec<1, T, P> const & v)
 	{
 		return vec<1, T, P>(
 			scalar - v.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator-(vec<1, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<1, T, P>(
 			v1.x - v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator*(vec<1, T, P> const & v, T scalar)
 	{
 		return vec<1, T, P>(
 			v.x * scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator*(T scalar, vec<1, T, P> const & v)
 	{
 		return vec<1, T, P>(
 			scalar * v.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator*(vec<1, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<1, T, P>(
 			v1.x * v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator/(vec<1, T, P> const & v, T scalar)
 	{
 		return vec<1, T, P>(
 			v.x / scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator/(T scalar, vec<1, T, P> const & v)
 	{
 		return vec<1, T, P>(
 			scalar / v.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator/(vec<1, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<1, T, P>(
@@ -397,133 +397,133 @@ namespace glm
 
 	// -- Binary bit operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator%(vec<1, T, P> const & v, T scalar)
 	{
 		return vec<1, T, P>(
 			v.x % scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator%(T scalar, vec<1, T, P> const & v)
 	{
 		return vec<1, T, P>(
 			scalar % v.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator%(vec<1, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<1, T, P>(
 			v1.x % v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator&(vec<1, T, P> const & v, T scalar)
 	{
 		return vec<1, T, P>(
 			v.x & scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator&(T scalar, vec<1, T, P> const & v)
 	{
 		return vec<1, T, P>(
 			scalar & v.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator&(vec<1, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<1, T, P>(
 			v1.x & v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator|(vec<1, T, P> const & v, T scalar)
 	{
 		return vec<1, T, P>(
 			v.x | scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator|(T scalar, vec<1, T, P> const & v)
 	{
 		return vec<1, T, P>(
 			scalar | v.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator|(vec<1, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<1, T, P>(
 			v1.x | v2.x);
 	}
 		
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator^(vec<1, T, P> const & v, T scalar)
 	{
 		return vec<1, T, P>(
 			v.x ^ scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator^(T scalar, vec<1, T, P> const & v)
 	{
 		return vec<1, T, P>(
 			scalar ^ v.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator^(vec<1, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<1, T, P>(
 			v1.x ^ v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator<<(vec<1, T, P> const & v, T scalar)
 	{
 		return vec<1, T, P>(
 			v.x << scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator<<(T scalar, vec<1, T, P> const & v)
 	{
 		return vec<1, T, P>(
 			scalar << v.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator<<(vec<1, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<1, T, P>(
 			v1.x << v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator>>(vec<1, T, P> const & v, T scalar)
 	{
 		return vec<1, T, P>(
 			v.x >> scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator>>(T scalar, vec<1, T, P> const & v)
 	{
 		return vec<1, T, P>(
 			scalar >> v.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator>>(vec<1, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<1, T, P>(
 			v1.x >> v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, T, P> operator~(vec<1, T, P> const & v)
 	{
 		return vec<1, T, P>(
@@ -532,25 +532,25 @@ namespace glm
 
 	// -- Boolean operators --
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER bool operator==(vec<1, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return (v1.x == v2.x);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER bool operator!=(vec<1, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return (v1.x != v2.x);
 	}
 
-	template <precision P>
+	template<precision P>
 	GLM_FUNC_QUALIFIER vec<1, bool, P> operator&&(vec<1, bool, P> const & v1, vec<1, bool, P> const & v2)
 	{
 		return vec<1, bool, P>(v1.x && v2.x);
 	}
 
-	template <precision P>
+	template<precision P>
 	GLM_FUNC_QUALIFIER vec<1, bool, P> operator||(vec<1, bool, P> const & v1, vec<1, bool, P> const & v2)
 	{
 		return vec<1, bool, P>(v1.x || v2.x);
diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp
index 138b3dd1..427ed850 100644
--- a/glm/detail/type_vec2.hpp
+++ b/glm/detail/type_vec2.hpp
@@ -15,7 +15,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct vec<2, T, P>
 	{
 		// -- Implementation detail --
@@ -85,7 +85,7 @@ namespace glm
 
 		GLM_FUNC_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR;
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec const& v) GLM_DEFAULT;
-		template <precision Q>
+		template<precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<2, T, Q> const& v);
 
 		// -- Explicit basic constructors --
@@ -97,27 +97,27 @@ namespace glm
 		// -- Conversion constructors --
 
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B>
+		template<typename A, typename B>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(A x, B y);
-		template <typename A, typename B>
+		template<typename A, typename B>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<1, A, P> const & v1, vec<1, B, P> const & v2);
 
 		// -- Conversion vector constructors --
 
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<3, U, Q> const & v);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<4, U, Q> const & v);
 
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<2, U, Q> const & v);
 
 		// -- Swizzle constructors --
 #		if GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED)
-			template <int E0, int E1>
+			template<int E0, int E1>
 			GLM_FUNC_DECL vec(detail::_swizzle<2, T, P, E0, E1,-1,-2> const& that)
 			{
 				*this = that();
@@ -128,31 +128,31 @@ namespace glm
 
 		GLM_FUNC_DECL vec& operator=(vec const & v) GLM_DEFAULT;
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec& operator=(vec<2, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec& operator+=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec& operator+=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec& operator+=(vec<2, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec& operator-=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec& operator-=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec& operator-=(vec<2, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec& operator*=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec& operator*=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec& operator*=(vec<2, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec& operator/=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec& operator/=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec& operator/=(vec<2, U, P> const & v);
 
 		// -- Increment and decrement operators --
@@ -164,219 +164,219 @@ namespace glm
 
 		// -- Unary bit operators --
 
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator%=(U scalar);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator%=(vec<1, U, P> const & v);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator%=(vec<2, U, P> const & v);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator&=(U scalar);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator&=(vec<1, U, P> const & v);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator&=(vec<2, U, P> const & v);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator|=(U scalar);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator|=(vec<1, U, P> const & v);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator|=(vec<2, U, P> const & v);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator^=(U scalar);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator^=(vec<1, U, P> const & v);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator^=(vec<2, U, P> const & v);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator<<=(U scalar);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator<<=(vec<1, U, P> const & v);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator<<=(vec<2, U, P> const & v);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator>>=(U scalar);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator>>=(vec<1, U, P> const & v);
-		template <typename U> 
+		template<typename U> 
 		GLM_FUNC_DECL vec & operator>>=(vec<2, U, P> const & v);
 	};
 
 	// -- Unary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator+(vec<2, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator-(vec<2, T, P> const & v);
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator+(vec<2, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator+(vec<2, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator+(T scalar, vec<2, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator+(vec<1, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator+(vec<2, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator-(vec<2, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator-(vec<2, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator-(T scalar, vec<2, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator-(vec<1, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator-(vec<2, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator*(vec<2, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator*(vec<2, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator*(T scalar, vec<2, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator*(vec<1, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator*(vec<2, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator/(vec<2, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator/(vec<2, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator/(T scalar, vec<2, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator/(vec<1, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator/(vec<2, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator%(vec<2, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator%(vec<2, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator%(T scalar, vec<2, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator%(vec<1, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator%(vec<2, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator&(vec<2, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator&(vec<2, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator&(T scalar, vec<2, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator&(vec<1, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator&(vec<2, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator|(vec<2, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator|(vec<2, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator|(T scalar, vec<2, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator|(vec<1, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator|(vec<2, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator^(vec<2, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator^(vec<2, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator^(T scalar, vec<2, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator^(vec<1, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator^(vec<2, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator<<(vec<2, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator<<(vec<2, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator<<(T scalar, vec<2, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator<<(vec<1, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator<<(vec<2, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator>>(vec<2, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator>>(vec<2, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator>>(T scalar, vec<2, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator>>(vec<1, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator>>(vec<2, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> operator~(vec<2, T, P> const & v);
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator==(vec<2, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator!=(vec<2, T, P> const & v1, vec<2, T, P> const & v2);
 
-	template <precision P>
+	template<precision P>
 	GLM_FUNC_DECL vec<2, bool, P> operator&&(vec<2, bool, P> const & v1, vec<2, bool, P> const & v2);
 
-	template <precision P>
+	template<precision P>
 	GLM_FUNC_DECL vec<2, bool, P> operator||(vec<2, bool, P> const & v1, vec<2, bool, P> const & v2);
 }//namespace glm
 
diff --git a/glm/detail/type_vec2.inl b/glm/detail/type_vec2.inl
index e52cfe70..856c6278 100644
--- a/glm/detail/type_vec2.inl
+++ b/glm/detail/type_vec2.inl
@@ -6,7 +6,7 @@ namespace glm
 	// -- Implicit basic constructors --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec()
 #			ifndef GLM_FORCE_NO_CTOR_INIT
 				: x(0), y(0)
@@ -15,45 +15,45 @@ namespace glm
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(vec<2, T, P> const & v)
 			: x(v.x), y(v.y)
 		{}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <precision Q>
+	template<typename T, precision P>
+	template<precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(vec<2, T, Q> const & v)
 		: x(v.x), y(v.y)
 	{}
 
 	// -- Explicit basic constructors --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR vec<2, T, P>::vec(ctor)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(T scalar)
 		: x(scalar), y(scalar)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(T s1, T s2)
 		: x(s1), y(s2)
 	{}
 
 	// -- Conversion scalar constructors --
 
-	template <typename T, precision P>
-	template <typename A, typename B>
+	template<typename T, precision P>
+	template<typename A, typename B>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(A a, B b)
 		: x(static_cast<T>(a))
 		, y(static_cast<T>(b))
 	{}
 
-	template <typename T, precision P>
-	template <typename A, typename B>
+	template<typename T, precision P>
+	template<typename A, typename B>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(vec<1, A, P> const & a, vec<1, B, P> const & b)
 		: x(static_cast<T>(a.x))
 		, y(static_cast<T>(b.x))
@@ -61,22 +61,22 @@ namespace glm
 
 	// -- Conversion vector constructors --
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(vec<2, U, Q> const & v)
 		: x(static_cast<T>(v.x))
 		, y(static_cast<T>(v.y))
 	{}
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(vec<3, U, Q> const & v)
 		: x(static_cast<T>(v.x))
 		, y(static_cast<T>(v.y))
 	{}
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, P>::vec(vec<4, U, Q> const & v)
 		: x(static_cast<T>(v.x))
 		, y(static_cast<T>(v.y))
@@ -84,14 +84,14 @@ namespace glm
 
 	// -- Component accesses --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T & vec<2, T, P>::operator[](typename vec<2, T, P>::length_type i)
 	{
 		assert(i >= 0 && i < this->length());
 		return (&x)[i];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T const & vec<2, T, P>::operator[](typename vec<2, T, P>::length_type i) const
 	{
 		assert(i >= 0 && i < this->length());
@@ -101,7 +101,7 @@ namespace glm
 	// -- Unary arithmetic operators --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator=(vec<2, T, P> const & v)
 		{
 			this->x = v.x;
@@ -110,8 +110,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator=(vec<2, U, P> const & v)
 	{
 		this->x = static_cast<T>(v.x);
@@ -119,8 +119,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator+=(U scalar)
 	{
 		this->x += static_cast<T>(scalar);
@@ -128,8 +128,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator+=(vec<1, U, P> const & v)
 	{
 		this->x += static_cast<T>(v.x);
@@ -137,8 +137,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator+=(vec<2, U, P> const & v)
 	{
 		this->x += static_cast<T>(v.x);
@@ -146,8 +146,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator-=(U scalar)
 	{
 		this->x -= static_cast<T>(scalar);
@@ -155,8 +155,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator-=(vec<1, U, P> const & v)
 	{
 		this->x -= static_cast<T>(v.x);
@@ -164,8 +164,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator-=(vec<2, U, P> const & v)
 	{
 		this->x -= static_cast<T>(v.x);
@@ -173,8 +173,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator*=(U scalar)
 	{
 		this->x *= static_cast<T>(scalar);
@@ -182,8 +182,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator*=(vec<1, U, P> const & v)
 	{
 		this->x *= static_cast<T>(v.x);
@@ -191,8 +191,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator*=(vec<2, U, P> const & v)
 	{
 		this->x *= static_cast<T>(v.x);
@@ -200,8 +200,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator/=(U scalar)
 	{
 		this->x /= static_cast<T>(scalar);
@@ -209,8 +209,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator/=(vec<1, U, P> const & v)
 	{
 		this->x /= static_cast<T>(v.x);
@@ -218,8 +218,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator/=(vec<2, U, P> const & v)
 	{
 		this->x /= static_cast<T>(v.x);
@@ -229,7 +229,7 @@ namespace glm
 
 	// -- Increment and decrement operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator++()
 	{
 		++this->x;
@@ -237,7 +237,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator--()
 	{
 		--this->x;
@@ -245,7 +245,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER vec<2, T, P> vec<2, T, P>::operator++(int)
 	{
 		vec<2, T, P> Result(*this);
@@ -253,7 +253,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER vec<2, T, P> vec<2, T, P>::operator--(int)
 	{
 		vec<2, T, P> Result(*this);
@@ -263,8 +263,8 @@ namespace glm
 
 	// -- Unary bit operators --
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator%=(U scalar)
 	{
 		this->x %= static_cast<T>(scalar);
@@ -272,8 +272,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator%=(vec<1, U, P> const & v)
 	{
 		this->x %= static_cast<T>(v.x);
@@ -281,8 +281,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator%=(vec<2, U, P> const & v)
 	{
 		this->x %= static_cast<T>(v.x);
@@ -290,8 +290,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator&=(U scalar)
 	{
 		this->x &= static_cast<T>(scalar);
@@ -299,8 +299,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator&=(vec<1, U, P> const & v)
 	{
 		this->x &= static_cast<T>(v.x);
@@ -308,8 +308,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator&=(vec<2, U, P> const & v)
 	{
 		this->x &= static_cast<T>(v.x);
@@ -317,8 +317,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator|=(U scalar)
 	{
 		this->x |= static_cast<T>(scalar);
@@ -326,8 +326,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator|=(vec<1, U, P> const & v)
 	{
 		this->x |= static_cast<T>(v.x);
@@ -335,8 +335,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator|=(vec<2, U, P> const & v)
 	{
 		this->x |= static_cast<T>(v.x);
@@ -344,8 +344,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator^=(U scalar)
 	{
 		this->x ^= static_cast<T>(scalar);
@@ -353,8 +353,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator^=(vec<1, U, P> const & v)
 	{
 		this->x ^= static_cast<T>(v.x);
@@ -362,8 +362,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator^=(vec<2, U, P> const & v)
 	{
 		this->x ^= static_cast<T>(v.x);
@@ -371,8 +371,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator<<=(U scalar)
 	{
 		this->x <<= static_cast<T>(scalar);
@@ -380,8 +380,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator<<=(vec<1, U, P> const & v)
 	{
 		this->x <<= static_cast<T>(v.x);
@@ -389,8 +389,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator<<=(vec<2, U, P> const & v)
 	{
 		this->x <<= static_cast<T>(v.x);
@@ -398,8 +398,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator>>=(U scalar)
 	{
 		this->x >>= static_cast<T>(scalar);
@@ -407,8 +407,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator>>=(vec<1, U, P> const & v)
 	{
 		this->x >>= static_cast<T>(v.x);
@@ -416,8 +416,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<2, T, P> & vec<2, T, P>::operator>>=(vec<2, U, P> const & v)
 	{
 		this->x >>= static_cast<T>(v.x);
@@ -427,13 +427,13 @@ namespace glm
 
 	// -- Unary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator+(vec<2, T, P> const & v)
 	{
 		return v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator-(vec<2, T, P> const & v)
 	{
 		return vec<2, T, P>(
@@ -443,7 +443,7 @@ namespace glm
 
 	// -- Binary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator+(vec<2, T, P> const & v, T scalar)
 	{
 		return vec<2, T, P>(
@@ -451,7 +451,7 @@ namespace glm
 			v.y + scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator+(vec<2, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -459,7 +459,7 @@ namespace glm
 			v1.y + v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator+(T scalar, vec<2, T, P> const & v)
 	{
 		return vec<2, T, P>(
@@ -467,7 +467,7 @@ namespace glm
 			scalar + v.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator+(vec<1, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -475,7 +475,7 @@ namespace glm
 			v1.x + v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator+(vec<2, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -483,7 +483,7 @@ namespace glm
 			v1.y + v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator-(vec<2, T, P> const & v, T scalar)
 	{
 		return vec<2, T, P>(
@@ -491,7 +491,7 @@ namespace glm
 			v.y - scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator-(vec<2, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -499,7 +499,7 @@ namespace glm
 			v1.y - v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator-(T scalar, vec<2, T, P> const & v)
 	{
 		return vec<2, T, P>(
@@ -507,7 +507,7 @@ namespace glm
 			scalar - v.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator-(vec<1, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -515,7 +515,7 @@ namespace glm
 			v1.x - v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator-(vec<2, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -523,7 +523,7 @@ namespace glm
 			v1.y - v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator*(vec<2, T, P> const & v, T scalar)
 	{
 		return vec<2, T, P>(
@@ -531,7 +531,7 @@ namespace glm
 			v.y * scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator*(vec<2, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -539,7 +539,7 @@ namespace glm
 			v1.y * v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator*(T scalar, vec<2, T, P> const & v)
 	{
 		return vec<2, T, P>(
@@ -547,7 +547,7 @@ namespace glm
 			scalar * v.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator*(vec<1, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -555,7 +555,7 @@ namespace glm
 			v1.x * v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator*(vec<2, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -563,7 +563,7 @@ namespace glm
 			v1.y * v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator/(vec<2, T, P> const & v, T scalar)
 	{
 		return vec<2, T, P>(
@@ -571,7 +571,7 @@ namespace glm
 			v.y / scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator/(vec<2, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -579,7 +579,7 @@ namespace glm
 			v1.y / v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator/(T scalar, vec<2, T, P> const & v)
 	{
 		return vec<2, T, P>(
@@ -587,7 +587,7 @@ namespace glm
 			scalar / v.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator/(vec<1, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -595,7 +595,7 @@ namespace glm
 			v1.x / v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator/(vec<2, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -605,7 +605,7 @@ namespace glm
 
 	// -- Binary bit operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator%(vec<2, T, P> const & v, T scalar)
 	{
 		return vec<2, T, P>(
@@ -613,7 +613,7 @@ namespace glm
 			v.y % scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator%(vec<2, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -621,7 +621,7 @@ namespace glm
 			v1.y % v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator%(T scalar, vec<2, T, P> const & v)
 	{
 		return vec<2, T, P>(
@@ -629,7 +629,7 @@ namespace glm
 			scalar % v.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator%(vec<1, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -637,7 +637,7 @@ namespace glm
 			v1.x % v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator%(vec<2, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -645,7 +645,7 @@ namespace glm
 			v1.y % v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator&(vec<2, T, P> const & v, T scalar)
 	{
 		return vec<2, T, P>(
@@ -653,7 +653,7 @@ namespace glm
 			v.y & scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator&(vec<2, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -661,7 +661,7 @@ namespace glm
 			v1.y & v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator&(T scalar, vec<2, T, P> const & v)
 	{
 		return vec<2, T, P>(
@@ -669,7 +669,7 @@ namespace glm
 			scalar & v.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator&(vec<1, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -677,7 +677,7 @@ namespace glm
 			v1.x & v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator&(vec<2, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -685,7 +685,7 @@ namespace glm
 			v1.y & v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator|(vec<2, T, P> const & v, T scalar)
 	{
 		return vec<2, T, P>(
@@ -693,7 +693,7 @@ namespace glm
 			v.y | scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator|(vec<2, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -701,7 +701,7 @@ namespace glm
 			v1.y | v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator|(T scalar, vec<2, T, P> const & v)
 	{
 		return vec<2, T, P>(
@@ -709,7 +709,7 @@ namespace glm
 			scalar | v.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator|(vec<1, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -717,7 +717,7 @@ namespace glm
 			v1.x | v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator|(vec<2, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -725,7 +725,7 @@ namespace glm
 			v1.y | v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator^(vec<2, T, P> const & v, T scalar)
 	{
 		return vec<2, T, P>(
@@ -733,7 +733,7 @@ namespace glm
 			v.y ^ scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator^(vec<2, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -741,7 +741,7 @@ namespace glm
 			v1.y ^ v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator^(T scalar, vec<2, T, P> const & v)
 	{
 		return vec<2, T, P>(
@@ -749,7 +749,7 @@ namespace glm
 			scalar ^ v.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator^(vec<1, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -757,7 +757,7 @@ namespace glm
 			v1.x ^ v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator^(vec<2, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -765,7 +765,7 @@ namespace glm
 			v1.y ^ v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator<<(vec<2, T, P> const & v, T scalar)
 	{
 		return vec<2, T, P>(
@@ -773,7 +773,7 @@ namespace glm
 			v.y << scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator<<(vec<2, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -781,7 +781,7 @@ namespace glm
 			v1.y << v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator<<(T scalar, vec<2, T, P> const & v)
 	{
 		return vec<2, T, P>(
@@ -789,7 +789,7 @@ namespace glm
 			scalar << v.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator<<(vec<1, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -797,7 +797,7 @@ namespace glm
 			v1.x << v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator<<(vec<2, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -805,7 +805,7 @@ namespace glm
 			v1.y << v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator>>(vec<2, T, P> const & v, T scalar)
 	{
 		return vec<2, T, P>(
@@ -813,7 +813,7 @@ namespace glm
 			v.y >> scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator>>(vec<2, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -821,7 +821,7 @@ namespace glm
 			v1.y >> v2.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator>>(T scalar, vec<2, T, P> const & v)
 	{
 		return vec<2, T, P>(
@@ -829,7 +829,7 @@ namespace glm
 			scalar >> v.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator>>(vec<1, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -837,7 +837,7 @@ namespace glm
 			v1.x >> v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator>>(vec<2, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return vec<2, T, P>(
@@ -845,7 +845,7 @@ namespace glm
 			v1.y >> v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> operator~(vec<2, T, P> const & v)
 	{
 		return vec<2, T, P>(
@@ -855,25 +855,25 @@ namespace glm
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator==(vec<2, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return (v1.x == v2.x) && (v1.y == v2.y);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator!=(vec<2, T, P> const & v1, vec<2, T, P> const & v2)
 	{
 		return (v1.x != v2.x) || (v1.y != v2.y);
 	}
 
-	template <precision P>
+	template<precision P>
 	GLM_FUNC_QUALIFIER vec<2, bool, P> operator&&(vec<2, bool, P> const & v1, vec<2, bool, P> const & v2)
 	{
 		return vec<2, bool, P>(v1.x && v2.x, v1.y && v2.y);
 	}
 
-	template <precision P>
+	template<precision P>
 	GLM_FUNC_QUALIFIER vec<2, bool, P> operator||(vec<2, bool, P> const & v1, vec<2, bool, P> const & v2)
 	{
 		return vec<2, bool, P>(v1.x || v2.x, v1.y || v2.y);
diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp
index d906a66b..c3ca1ca9 100644
--- a/glm/detail/type_vec3.hpp
+++ b/glm/detail/type_vec3.hpp
@@ -15,7 +15,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct vec<3, T, P>
 	{
 		// -- Implementation detail --
@@ -85,7 +85,7 @@ namespace glm
 
 		GLM_FUNC_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR;
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec const & v) GLM_DEFAULT;
-		template <precision Q>
+		template<precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<3, T, Q> const & v);
 
 		// -- Explicit basic constructors --
@@ -97,48 +97,48 @@ namespace glm
 		// -- Conversion scalar constructors --
 
 		/// Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, typename C>
+		template<typename A, typename B, typename C>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(A a, B b, C c);
-		template <typename A, typename B, typename C>
+		template<typename A, typename B, typename C>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<1, A, P> const & a, vec<1, B, P> const & b, vec<1, C, P> const & c);
 
 		// -- Conversion vector constructors --
 
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, precision Q>
+		template<typename A, typename B, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<2, A, Q> const & a, B b);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, precision Q>
+		template<typename A, typename B, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<2, A, Q> const & a, vec<1, B, Q> const & b);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, precision Q>
+		template<typename A, typename B, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(A a, vec<2, B, Q> const & b);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, precision Q>
+		template<typename A, typename B, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<1, A, Q> const & a, vec<2, B, Q> const & b);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<4, U, Q> const & v);
 
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<3, U, Q> const & v);
 
 		// -- Swizzle constructors --
 #		if GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED)
-			template <int E0, int E1, int E2>
+			template<int E0, int E1, int E2>
 			GLM_FUNC_DECL vec(detail::_swizzle<3, T, P, E0, E1, E2, -1> const & that)
 			{
 				*this = that();
 			}
 
-			template <int E0, int E1>
+			template<int E0, int E1>
 			GLM_FUNC_DECL vec(detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v, T const & scalar)
 			{
 				*this = vec(v(), scalar);
 			}
 
-			template <int E0, int E1>
+			template<int E0, int E1>
 			GLM_FUNC_DECL vec(T const & scalar, detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v)
 			{
 				*this = vec(scalar, v());
@@ -149,31 +149,31 @@ namespace glm
 
 		GLM_FUNC_DECL vec & operator=(vec const & v) GLM_DEFAULT;
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator=(vec<3, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator+=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator+=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator+=(vec<3, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator-=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator-=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator-=(vec<3, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator*=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator*=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator*=(vec<3, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator/=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator/=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator/=(vec<3, U, P> const & v);
 
 		// -- Increment and decrement operators --
@@ -185,219 +185,219 @@ namespace glm
 
 		// -- Unary bit operators --
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator%=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator%=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator%=(vec<3, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator&=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator&=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator&=(vec<3, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator|=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator|=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator|=(vec<3, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator^=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator^=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator^=(vec<3, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator<<=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator<<=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator<<=(vec<3, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator>>=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator>>=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec & operator>>=(vec<3, U, P> const & v);
 	};
 
 	// -- Unary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator+(vec<3, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator-(vec<3, T, P> const & v);
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator+(vec<3, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator+(vec<3, T, P> const & v, vec<1, T, P> const & scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator+(T scalar, vec<3, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator+(vec<1, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator+(vec<3, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator-(vec<3, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator-(vec<3, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator-(T scalar, vec<3, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator-(vec<1, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator-(vec<3, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator*(vec<3, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator*(vec<3, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator*(T scalar, vec<3, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator*(vec<1, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator*(vec<3, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator/(vec<3, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator/(vec<3, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator/(T scalar, vec<3, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator/(vec<1, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator/(vec<3, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator%(vec<3, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator%(vec<3, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator%(T const & scalar, vec<3, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator%(vec<1, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator%(vec<3, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator&(vec<3, T, P> const & v1, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator&(vec<3, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator&(T scalar, vec<3, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator&(vec<1, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator&(vec<3, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator|(vec<3, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator|(vec<3, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator|(T scalar, vec<3, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator|(vec<1, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator|(vec<3, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator^(vec<3, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator^(vec<3, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator^(T scalar, vec<3, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator^(vec<1, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator^(vec<3, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator<<(vec<3, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator<<(vec<3, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator<<(T scalar, vec<3, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator<<(vec<1, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator<<(vec<3, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator>>(vec<3, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator>>(vec<3, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator>>(T scalar, vec<3, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator>>(vec<1, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator>>(vec<3, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_DECL vec<3, T, P> operator~(vec<3, T, P> const & v);
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator==(vec<3, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator!=(vec<3, T, P> const & v1, vec<3, T, P> const & v2);
 
-	template <precision P>
+	template<precision P>
 	GLM_FUNC_DECL vec<3, bool, P> operator&&(vec<3, bool, P> const & v1, vec<3, bool, P> const & v2);
 
-	template <precision P>
+	template<precision P>
 	GLM_FUNC_DECL vec<3, bool, P> operator||(vec<3, bool, P> const & v1, vec<3, bool, P> const & v2);
 }//namespace glm
 
diff --git a/glm/detail/type_vec3.inl b/glm/detail/type_vec3.inl
index 39fb0bf3..55b17efe 100644
--- a/glm/detail/type_vec3.inl
+++ b/glm/detail/type_vec3.inl
@@ -6,7 +6,7 @@ namespace glm
 	// -- Implicit basic constructors --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec()
 #			ifndef GLM_FORCE_NO_CTOR_INIT 
 				: x(0), y(0), z(0)
@@ -15,46 +15,46 @@ namespace glm
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(vec<3, T, P> const & v)
 			: x(v.x), y(v.y), z(v.z)
 		{}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <precision Q>
+	template<typename T, precision P>
+	template<precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(vec<3, T, Q> const & v)
 		: x(v.x), y(v.y), z(v.z)
 	{}
 
 	// -- Explicit basic constructors --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR vec<3, T, P>::vec(ctor)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(T scalar)
 		: x(scalar), y(scalar), z(scalar)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(T a, T b, T c)
 		: x(a), y(b), z(c)
 	{}
 
 	// -- Conversion scalar constructors --
 
-	template <typename T, precision P>
-	template <typename A, typename B, typename C>
+	template<typename T, precision P>
+	template<typename A, typename B, typename C>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(A a, B b, C c) :
 		x(static_cast<T>(a)),
 		y(static_cast<T>(b)),
 		z(static_cast<T>(c))
 	{}
 
-	template <typename T, precision P>
-	template <typename A, typename B, typename C>
+	template<typename T, precision P>
+	template<typename A, typename B, typename C>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(vec<1, A, P> const & a, vec<1, B, P> const & b, vec<1, C, P> const & c) :
 		x(static_cast<T>(a)),
 		y(static_cast<T>(b)),
@@ -63,48 +63,48 @@ namespace glm
 
 	// -- Conversion vector constructors --
 
-	template <typename T, precision P>
-	template <typename A, typename B, precision Q>
+	template<typename T, precision P>
+	template<typename A, typename B, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(vec<2, A, Q> const & a, B b) :
 		x(static_cast<T>(a.x)),
 		y(static_cast<T>(a.y)),
 		z(static_cast<T>(b))
 	{}
 
-	template <typename T, precision P>
-	template <typename A, typename B, precision Q>
+	template<typename T, precision P>
+	template<typename A, typename B, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(vec<2, A, Q> const & a, vec<1, B, Q> const & b) :
 		x(static_cast<T>(a.x)),
 		y(static_cast<T>(a.y)),
 		z(static_cast<T>(b.x))
 	{}
 
-	template <typename T, precision P>
-	template <typename A, typename B, precision Q>
+	template<typename T, precision P>
+	template<typename A, typename B, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(A a, vec<2, B, Q> const & b) :
 		x(static_cast<T>(a)),
 		y(static_cast<T>(b.x)),
 		z(static_cast<T>(b.y))
 	{}
 
-	template <typename T, precision P>
-	template <typename A, typename B, precision Q>
+	template<typename T, precision P>
+	template<typename A, typename B, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(vec<1, A, Q> const & a, vec<2, B, Q> const & b) :
 		x(static_cast<T>(a.x)),
 		y(static_cast<T>(b.x)),
 		z(static_cast<T>(b.y))
 	{}
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(vec<3, U, Q> const & v) :
 		x(static_cast<T>(v.x)),
 		y(static_cast<T>(v.y)),
 		z(static_cast<T>(v.z))
 	{}
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, P>::vec(vec<4, U, Q> const & v) :
 		x(static_cast<T>(v.x)),
 		y(static_cast<T>(v.y)),
@@ -113,14 +113,14 @@ namespace glm
 
 	// -- Component accesses --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T & vec<3, T, P>::operator[](typename vec<3, T, P>::length_type i)
 	{
 		assert(i >= 0 && i < this->length());
 		return (&x)[i];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T const & vec<3, T, P>::operator[](typename vec<3, T, P>::length_type i) const
 	{
 		assert(i >= 0 && i < this->length());
@@ -130,7 +130,7 @@ namespace glm
 	// -- Unary arithmetic operators --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER vec<3, T, P>& vec<3, T, P>::operator=(vec<3, T, P> const & v)
 		{
 			this->x = v.x;
@@ -140,8 +140,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P>& vec<3, T, P>::operator=(vec<3, U, P> const & v)
 	{
 		this->x = static_cast<T>(v.x);
@@ -150,8 +150,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator+=(U scalar)
 	{
 		this->x += static_cast<T>(scalar);
@@ -160,8 +160,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator+=(vec<1, U, P> const & v)
 	{
 		this->x += static_cast<T>(v.x);
@@ -170,8 +170,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator+=(vec<3, U, P> const & v)
 	{
 		this->x += static_cast<T>(v.x);
@@ -180,8 +180,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator-=(U scalar)
 	{
 		this->x -= static_cast<T>(scalar);
@@ -190,8 +190,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator-=(vec<1, U, P> const & v)
 	{
 		this->x -= static_cast<T>(v.x);
@@ -200,8 +200,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator-=(vec<3, U, P> const & v)
 	{
 		this->x -= static_cast<T>(v.x);
@@ -210,8 +210,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator*=(U scalar)
 	{
 		this->x *= static_cast<T>(scalar);
@@ -220,8 +220,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator*=(vec<1, U, P> const & v)
 	{
 		this->x *= static_cast<T>(v.x);
@@ -230,8 +230,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator*=(vec<3, U, P> const & v)
 	{
 		this->x *= static_cast<T>(v.x);
@@ -240,8 +240,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator/=(U v)
 	{
 		this->x /= static_cast<T>(v);
@@ -250,8 +250,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator/=(vec<1, U, P> const & v)
 	{
 		this->x /= static_cast<T>(v.x);
@@ -260,8 +260,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator/=(vec<3, U, P> const & v)
 	{
 		this->x /= static_cast<T>(v.x);
@@ -272,7 +272,7 @@ namespace glm
 
 	// -- Increment and decrement operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator++()
 	{
 		++this->x;
@@ -281,7 +281,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator--()
 	{
 		--this->x;
@@ -290,7 +290,7 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> vec<3, T, P>::operator++(int)
 	{
 		vec<3, T, P> Result(*this);
@@ -298,7 +298,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> vec<3, T, P>::operator--(int)
 	{
 		vec<3, T, P> Result(*this);
@@ -308,8 +308,8 @@ namespace glm
 
 	// -- Unary bit operators --
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator%=(U scalar)
 	{
 		this->x %= scalar;
@@ -318,8 +318,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator%=(vec<1, U, P> const & v)
 	{
 		this->x %= v.x;
@@ -328,8 +328,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator%=(vec<3, U, P> const & v)
 	{
 		this->x %= v.x;
@@ -338,8 +338,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator&=(U scalar)
 	{
 		this->x &= scalar;
@@ -348,8 +348,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator&=(vec<1, U, P> const & v)
 	{
 		this->x &= v.x;
@@ -358,8 +358,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator&=(vec<3, U, P> const & v)
 	{
 		this->x &= v.x;
@@ -368,8 +368,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator|=(U scalar)
 	{
 		this->x |= scalar;
@@ -378,8 +378,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator|=(vec<1, U, P> const & v)
 	{
 		this->x |= v.x;
@@ -388,8 +388,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator|=(vec<3, U, P> const & v)
 	{
 		this->x |= v.x;
@@ -398,8 +398,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator^=(U scalar)
 	{
 		this->x ^= scalar;
@@ -408,8 +408,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator^=(vec<1, U, P> const & v)
 	{
 		this->x ^= v.x;
@@ -418,8 +418,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator^=(vec<3, U, P> const & v)
 	{
 		this->x ^= v.x;
@@ -428,8 +428,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator<<=(U scalar)
 	{
 		this->x <<= scalar;
@@ -438,8 +438,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator<<=(vec<1, U, P> const & v)
 	{
 		this->x <<= static_cast<T>(v.x);
@@ -448,8 +448,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator<<=(vec<3, U, P> const & v)
 	{
 		this->x <<= static_cast<T>(v.x);
@@ -458,8 +458,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator>>=(U scalar)
 	{
 		this->x >>= static_cast<T>(scalar);
@@ -468,8 +468,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator>>=(vec<1, U, P> const & v)
 	{
 		this->x >>= static_cast<T>(v.x);
@@ -478,8 +478,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U> 
+	template<typename T, precision P>
+	template<typename U> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> & vec<3, T, P>::operator>>=(vec<3, U, P> const & v)
 	{
 		this->x >>= static_cast<T>(v.x);
@@ -490,13 +490,13 @@ namespace glm
 
 	// -- Unary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator+(vec<3, T, P> const & v)
 	{
 		return v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator-(vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -507,7 +507,7 @@ namespace glm
 
 	// -- Binary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator+(vec<3, T, P> const & v, T scalar)
 	{
 		return vec<3, T, P>(
@@ -516,7 +516,7 @@ namespace glm
 			v.z + scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator+(vec<3, T, P> const & v, vec<1, T, P> const & scalar)
 	{
 		return vec<3, T, P>(
@@ -525,7 +525,7 @@ namespace glm
 			v.z + scalar.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator+(T scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -534,7 +534,7 @@ namespace glm
 			scalar + v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator+(vec<1, T, P> const & scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -543,7 +543,7 @@ namespace glm
 			scalar.x + v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator+(vec<3, T, P> const & v1, vec<3, T, P> const & v2)
 	{
 		return vec<3, T, P>(
@@ -552,7 +552,7 @@ namespace glm
 			v1.z + v2.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator-(vec<3, T, P> const & v, T scalar)
 	{
 		return vec<3, T, P>(
@@ -561,7 +561,7 @@ namespace glm
 			v.z - scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator-(vec<3, T, P> const & v, vec<1, T, P> const & scalar)
 	{
 		return vec<3, T, P>(
@@ -570,7 +570,7 @@ namespace glm
 			v.z - scalar.x);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator-(T scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -579,7 +579,7 @@ namespace glm
 			scalar - v.z);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator-(vec<1, T, P> const & scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -588,7 +588,7 @@ namespace glm
 			scalar.x - v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator-(vec<3, T, P> const & v1, vec<3, T, P> const & v2)
 	{
 		return vec<3, T, P>(
@@ -597,7 +597,7 @@ namespace glm
 			v1.z - v2.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator*(vec<3, T, P> const & v, T scalar)
 	{
 		return vec<3, T, P>(
@@ -606,7 +606,7 @@ namespace glm
 			v.z * scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator*(vec<3, T, P> const & v, vec<1, T, P> const & scalar)
 	{
 		return vec<3, T, P>(
@@ -615,7 +615,7 @@ namespace glm
 			v.z * scalar.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator*(T scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -624,7 +624,7 @@ namespace glm
 			scalar * v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator*(vec<1, T, P> const & scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -633,7 +633,7 @@ namespace glm
 			scalar.x * v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator*(vec<3, T, P> const & v1, vec<3, T, P> const & v2)
 	{
 		return vec<3, T, P>(
@@ -642,7 +642,7 @@ namespace glm
 			v1.z * v2.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator/(vec<3, T, P> const & v, T scalar)
 	{
 		return vec<3, T, P>(
@@ -651,7 +651,7 @@ namespace glm
 			v.z / scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator/(vec<3, T, P> const & v, vec<1, T, P> const & scalar)
 	{
 		return vec<3, T, P>(
@@ -660,7 +660,7 @@ namespace glm
 			v.z / scalar.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator/(T scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -669,7 +669,7 @@ namespace glm
 			scalar / v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator/(vec<1, T, P> const & scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -678,7 +678,7 @@ namespace glm
 			scalar.x / v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator/(vec<3, T, P> const & v1, vec<3, T, P> const & v2)
 	{
 		return vec<3, T, P>(
@@ -689,7 +689,7 @@ namespace glm
 
 	// -- Binary bit operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator%(vec<3, T, P> const & v, T scalar)
 	{
 		return vec<3, T, P>(
@@ -698,7 +698,7 @@ namespace glm
 			v.z % scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator%(vec<3, T, P> const & v, vec<1, T, P> const & scalar)
 	{
 		return vec<3, T, P>(
@@ -707,7 +707,7 @@ namespace glm
 			v.z % scalar.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator%(T scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -716,7 +716,7 @@ namespace glm
 			scalar % v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator%(vec<1, T, P> const & scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -725,7 +725,7 @@ namespace glm
 			scalar.x % v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator%(vec<3, T, P> const & v1, vec<3, T, P> const & v2)
 	{
 		return vec<3, T, P>(
@@ -734,7 +734,7 @@ namespace glm
 			v1.z % v2.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator&(vec<3, T, P> const & v, T scalar)
 	{
 		return vec<3, T, P>(
@@ -743,7 +743,7 @@ namespace glm
 			v.z & scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator&(vec<3, T, P> const & v, vec<1, T, P> const & scalar)
 	{
 		return vec<3, T, P>(
@@ -752,7 +752,7 @@ namespace glm
 			v.z & scalar.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator&(T scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -761,7 +761,7 @@ namespace glm
 			scalar & v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator&(vec<1, T, P> const & scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -770,7 +770,7 @@ namespace glm
 			scalar.x & v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator&(vec<3, T, P> const & v1, vec<3, T, P> const & v2)
 	{
 		return vec<3, T, P>(
@@ -779,7 +779,7 @@ namespace glm
 			v1.z & v2.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator|(vec<3, T, P> const & v, T scalar)
 	{
 		return vec<3, T, P>(
@@ -788,7 +788,7 @@ namespace glm
 			v.z | scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator|(vec<3, T, P> const & v, vec<1, T, P> const & scalar)
 	{
 		return vec<3, T, P>(
@@ -797,7 +797,7 @@ namespace glm
 			v.z | scalar.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator|(T scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -806,7 +806,7 @@ namespace glm
 			scalar | v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator|(vec<1, T, P> const & scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -815,7 +815,7 @@ namespace glm
 			scalar.x | v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator|(vec<3, T, P> const & v1, vec<3, T, P> const & v2)
 	{
 		return vec<3, T, P>(
@@ -824,7 +824,7 @@ namespace glm
 			v1.z | v2.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator^(vec<3, T, P> const & v, T scalar)
 	{
 		return vec<3, T, P>(
@@ -833,7 +833,7 @@ namespace glm
 			v.z ^ scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator^(vec<3, T, P> const & v, vec<1, T, P> const & scalar)
 	{
 		return vec<3, T, P>(
@@ -842,7 +842,7 @@ namespace glm
 			v.z ^ scalar.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator^(T scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -851,7 +851,7 @@ namespace glm
 			scalar ^ v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator^(vec<1, T, P> const & scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -860,7 +860,7 @@ namespace glm
 			scalar.x ^ v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator^(vec<3, T, P> const & v1, vec<3, T, P> const & v2)
 	{
 		return vec<3, T, P>(
@@ -869,7 +869,7 @@ namespace glm
 			v1.z ^ v2.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator<<(vec<3, T, P> const & v, T scalar)
 	{
 		return vec<3, T, P>(
@@ -878,7 +878,7 @@ namespace glm
 			v.z << scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator<<(vec<3, T, P> const & v, vec<1, T, P> const & scalar)
 	{
 		return vec<3, T, P>(
@@ -887,7 +887,7 @@ namespace glm
 			v.z << scalar.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator<<(T scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -896,7 +896,7 @@ namespace glm
 			scalar << v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator<<(vec<1, T, P> const & scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -905,7 +905,7 @@ namespace glm
 			scalar.x << v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator<<(vec<3, T, P> const & v1, vec<3, T, P> const & v2)
 	{
 		return vec<3, T, P>(
@@ -914,7 +914,7 @@ namespace glm
 			v1.z << v2.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator>>(vec<3, T, P> const & v, T scalar)
 	{
 		return vec<3, T, P>(
@@ -923,7 +923,7 @@ namespace glm
 			v.z >> scalar);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator>>(vec<3, T, P> const & v, vec<1, T, P> const & scalar)
 	{
 		return vec<3, T, P>(
@@ -932,7 +932,7 @@ namespace glm
 			v.z >> scalar.x);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator>>(T scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -941,7 +941,7 @@ namespace glm
 			scalar >> v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator>>(vec<1, T, P> const & scalar, vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -950,7 +950,7 @@ namespace glm
 			scalar.x >> v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator>>(vec<3, T, P> const & v1, vec<3, T, P> const & v2)
 	{
 		return vec<3, T, P>(
@@ -959,7 +959,7 @@ namespace glm
 			v1.z >> v2.z);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator~(vec<3, T, P> const & v)
 	{
 		return vec<3, T, P>(
@@ -970,25 +970,25 @@ namespace glm
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator==(vec<3, T, P> const & v1, vec<3, T, P> const & v2)
 	{
 		return (v1.x == v2.x) && (v1.y == v2.y) && (v1.z == v2.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator!=(vec<3, T, P> const & v1, vec<3, T, P> const & v2)
 	{
 		return (v1.x != v2.x) || (v1.y != v2.y) || (v1.z != v2.z);
 	}
 
-	template <precision P>
+	template<precision P>
 	GLM_FUNC_QUALIFIER vec<3, bool, P> operator&&(vec<3, bool, P> const & v1, vec<3, bool, P> const & v2)
 	{
 		return vec<3, bool, P>(v1.x && v2.x, v1.y && v2.y, v1.z && v2.z);
 	}
 
-	template <precision P>
+	template<precision P>
 	GLM_FUNC_QUALIFIER vec<3, bool, P> operator||(vec<3, bool, P> const & v1, vec<3, bool, P> const & v2)
 	{
 		return vec<3, bool, P>(v1.x || v2.x, v1.y || v2.y, v1.z || v2.z);
diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp
index 40ce10fd..35a5ff4c 100644
--- a/glm/detail/type_vec4.hpp
+++ b/glm/detail/type_vec4.hpp
@@ -15,7 +15,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct vec<4, T, P>
 	{
 		// -- Implementation detail --
@@ -88,7 +88,7 @@ namespace glm
 
 		GLM_FUNC_DECL GLM_CONSTEXPR_SIMD vec() GLM_DEFAULT_CTOR;
 		GLM_FUNC_DECL GLM_CONSTEXPR_SIMD vec(vec<4, T, P> const& v) GLM_DEFAULT;
-		template <precision Q>
+		template<precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR_SIMD vec(vec<4, T, Q> const& v);
 
 		// -- Explicit basic constructors --
@@ -100,90 +100,90 @@ namespace glm
 		// -- Conversion scalar constructors --
 
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, typename C, typename D>
+		template<typename A, typename B, typename C, typename D>
 		GLM_FUNC_DECL GLM_CONSTEXPR_SIMD vec(A a, B b, C c, D d);
-		template <typename A, typename B, typename C, typename D>
+		template<typename A, typename B, typename C, typename D>
 		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR vec(vec<1, A, P> const& a, vec<1, B, P> const& b, vec<1, C, P> const& c, vec<1, D, P> const& d);
 
 		// -- Conversion vector constructors --
 
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, typename C, precision Q>
+		template<typename A, typename B, typename C, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<2, A, Q> const & a, B b, C c);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, typename C, precision Q>
+		template<typename A, typename B, typename C, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<2, A, Q> const & a, vec<1, B, Q> const & b, vec<1, C, Q> const & c);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, typename C, precision Q>
+		template<typename A, typename B, typename C, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(A a, vec<2, B, Q> const & b, C c);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, typename C, precision Q>
+		template<typename A, typename B, typename C, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<1, A, Q> const & a, vec<2, B, Q> const & b, vec<1, C, Q> const & c);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, typename C, precision Q>
+		template<typename A, typename B, typename C, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(A a, B b, vec<2, C, Q> const & c);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, typename C, precision Q>
+		template<typename A, typename B, typename C, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<1, A, Q> const & a, vec<1, B, Q> const & b, vec<2, C, Q> const & c);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, precision Q>
+		template<typename A, typename B, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<3, A, Q> const & a, B b);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, precision Q>
+		template<typename A, typename B, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<3, A, Q> const & a, vec<1, B, Q> const & b);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, precision Q>
+		template<typename A, typename B, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(A a, vec<3, B, Q> const & b);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, precision Q>
+		template<typename A, typename B, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<1, A, Q> const & a, vec<3, B, Q> const & b);
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename A, typename B, precision Q>
+		template<typename A, typename B, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR vec(vec<2, A, Q> const & a, vec<2, B, Q> const & b);
 
 		/// Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT vec(vec<4, U, Q> const& v);
 
 		// -- Swizzle constructors --
 #		if GLM_HAS_UNRESTRICTED_UNIONS && (GLM_SWIZZLE == GLM_SWIZZLE_ENABLED)
-			template <int E0, int E1, int E2, int E3>
+			template<int E0, int E1, int E2, int E3>
 			GLM_FUNC_DECL vec(detail::_swizzle<4, T, P, E0, E1, E2, E3> const & that)
 			{
 				*this = that();
 			}
 
-			template <int E0, int E1, int F0, int F1>
+			template<int E0, int E1, int F0, int F1>
 			GLM_FUNC_DECL vec(detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v, detail::_swizzle<2, T, P, F0, F1, -1, -2> const & u)
 			{
 				*this = vec<4, T, P>(v(), u());
 			}
 
-			template <int E0, int E1>
+			template<int E0, int E1>
 			GLM_FUNC_DECL vec(T const & x, T const & y, detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v)
 			{
 				*this = vec<4, T, P>(x, y, v());
 			}
 
-			template <int E0, int E1>
+			template<int E0, int E1>
 			GLM_FUNC_DECL vec(T const & x, detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v, T const & w)
 			{
 				*this = vec<4, T, P>(x, v(), w);
 			}
 
-			template <int E0, int E1>
+			template<int E0, int E1>
 			GLM_FUNC_DECL vec(detail::_swizzle<2, T, P, E0, E1, -1, -2> const & v, T const & z, T const & w)
 			{
 				*this = vec<4, T, P>(v(), z, w);
 			}
 
-			template <int E0, int E1, int E2>
+			template<int E0, int E1, int E2>
 			GLM_FUNC_DECL vec(detail::_swizzle<3, T, P, E0, E1, E2, -1> const & v, T const & w)
 			{
 				*this = vec<4, T, P>(v(), w);
 			}
 
-			template <int E0, int E1, int E2>
+			template<int E0, int E1, int E2>
 			GLM_FUNC_DECL vec(T const & x, detail::_swizzle<3, T, P, E0, E1, E2, -1> const & v)
 			{
 				*this = vec<4, T, P>(x, v());
@@ -194,31 +194,31 @@ namespace glm
 
 		GLM_FUNC_DECL vec<4, T, P> & operator=(vec<4, T, P> const & v) GLM_DEFAULT;
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator=(vec<4, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator+=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator+=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator+=(vec<4, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator-=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator-=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator-=(vec<4, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator*=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator*=(vec<1, U, P> const& v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator*=(vec<4, U, P> const& v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator/=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator/=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator/=(vec<4, U, P> const & v);
 
 		// -- Increment and decrement operators --
@@ -230,219 +230,219 @@ namespace glm
 
 		// -- Unary bit operators --
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator%=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator%=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator%=(vec<4, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator&=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator&=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator&=(vec<4, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator|=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator|=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator|=(vec<4, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator^=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator^=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator^=(vec<4, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator<<=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator<<=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator<<=(vec<4, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator>>=(U scalar);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator>>=(vec<1, U, P> const & v);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL vec<4, T, P> & operator>>=(vec<4, U, P> const & v);
 	};
 
 	// -- Unary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator+(vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator-(vec<4, T, P> const & v);
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator+(vec<4, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator+(vec<4, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator+(T scalar, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator+(vec<1, T, P> const & v1, vec<4, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator+(vec<4, T, P> const & v1, vec<4, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator-(vec<4, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator-(vec<4, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator-(T scalar, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator-(vec<1, T, P> const & v1, vec<4, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator-(vec<4, T, P> const & v1, vec<4, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator*(vec<4, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator*(vec<4, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator*(T scalar, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator*(vec<1, T, P> const & v1, vec<4, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator*(vec<4, T, P> const & v1, vec<4, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator/(vec<4, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator/(vec<4, T, P> const & v1, vec<1, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator/(T scalar, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator/(vec<1, T, P> const & v1, vec<4, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator/(vec<4, T, P> const & v1, vec<4, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator%(vec<4, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator%(vec<4, T, P> const & v, vec<1, T, P> const & scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator%(T scalar, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator%(vec<1, T, P> const & scalar, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator%(vec<4, T, P> const & v1, vec<4, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator&(vec<4, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator&(vec<4, T, P> const & v, vec<1, T, P> const & scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator&(T scalar, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator&(vec<1, T, P> const & scalar, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator&(vec<4, T, P> const & v1, vec<4, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator|(vec<4, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator|(vec<4, T, P> const & v, vec<1, T, P> const & scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator|(T scalar, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator|(vec<1, T, P> const & scalar, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator|(vec<4, T, P> const & v1, vec<4, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator^(vec<4, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator^(vec<4, T, P> const & v, vec<1, T, P> const & scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator^(T scalar, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator^(vec<1, T, P> const & scalar, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator^(vec<4, T, P> const & v1, vec<4, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator<<(vec<4, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator<<(vec<4, T, P> const & v, vec<1, T, P> const & scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator<<(T scalar, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator<<(vec<1, T, P> const & scalar, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator<<(vec<4, T, P> const & v1, vec<4, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator>>(vec<4, T, P> const & v, T scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator>>(vec<4, T, P> const & v, vec<1, T, P> const & scalar);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator>>(T scalar, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator>>(vec<1, T, P> const & scalar, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator>>(vec<4, T, P> const & v1, vec<4, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator~(vec<4, T, P> const & v);
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator==(vec<4, T, P> const & v1, vec<4, T, P> const & v2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator!=(vec<4, T, P> const & v1, vec<4, T, P> const & v2);
 
-	template <precision P>
+	template<precision P>
 	GLM_FUNC_DECL vec<4, bool, P> operator&&(vec<4, bool, P> const & v1, vec<4, bool, P> const & v2);
 
-	template <precision P>
+	template<precision P>
 	GLM_FUNC_DECL vec<4, bool, P> operator||(vec<4, bool, P> const & v1, vec<4, bool, P> const & v2);
 }//namespace glm
 
diff --git a/glm/detail/type_vec4.inl b/glm/detail/type_vec4.inl
index d177c5eb..0310c50e 100644
--- a/glm/detail/type_vec4.inl
+++ b/glm/detail/type_vec4.inl
@@ -4,37 +4,37 @@
 namespace glm{
 namespace detail
 {
-	template <typename T>
+	template<typename T>
 	struct is_int
 	{
 		enum test {value = 0};
 	};
 
-	template <>
+	template<>
 	struct is_int<uint32>
 	{
 		enum test {value = ~0};
 	};
 
-	template <>
+	template<>
 	struct is_int<int32>
 	{
 		enum test {value = ~0};
 	};
 
-	template <>
+	template<>
 	struct is_int<uint64>
 	{
 		enum test {value = ~0};
 	};
 
-	template <>
+	template<>
 	struct is_int<int64>
 	{
 		enum test {value = ~0};
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_vec4_add
 	{
 		GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b)
@@ -43,7 +43,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_vec4_sub
 	{
 		GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b)
@@ -52,7 +52,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_vec4_mul
 	{
 		GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b)
@@ -61,7 +61,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_vec4_div
 	{
 		GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b)
@@ -70,7 +70,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_vec4_mod
 	{
 		GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b)
@@ -79,7 +79,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, int IsInt, std::size_t Size, bool Aligned>
+	template<typename T, precision P, int IsInt, std::size_t Size, bool Aligned>
 	struct compute_vec4_and
 	{
 		GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b)
@@ -88,7 +88,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, int IsInt, std::size_t Size, bool Aligned>
+	template<typename T, precision P, int IsInt, std::size_t Size, bool Aligned>
 	struct compute_vec4_or
 	{
 		GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b)
@@ -97,7 +97,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, int IsInt, std::size_t Size, bool Aligned>
+	template<typename T, precision P, int IsInt, std::size_t Size, bool Aligned>
 	struct compute_vec4_xor
 	{
 		GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b)
@@ -106,7 +106,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, int IsInt, std::size_t Size, bool Aligned>
+	template<typename T, precision P, int IsInt, std::size_t Size, bool Aligned>
 	struct compute_vec4_shift_left
 	{
 		GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b)
@@ -115,7 +115,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, int IsInt, std::size_t Size, bool Aligned>
+	template<typename T, precision P, int IsInt, std::size_t Size, bool Aligned>
 	struct compute_vec4_shift_right
 	{
 		GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & a, vec<4, T, P> const & b)
@@ -124,7 +124,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, int IsInt, std::size_t Size, bool Aligned>
+	template<typename T, precision P, int IsInt, std::size_t Size, bool Aligned>
 	struct compute_vec4_equal
 	{
 		GLM_FUNC_QUALIFIER static bool call(vec<4, T, P> const & v1, vec<4, T, P> const & v2)
@@ -133,7 +133,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, int IsInt, std::size_t Size, bool Aligned>
+	template<typename T, precision P, int IsInt, std::size_t Size, bool Aligned>
 	struct compute_vec4_nequal
 	{
 		GLM_FUNC_QUALIFIER static bool call(vec<4, T, P> const & v1, vec<4, T, P> const & v2)
@@ -142,7 +142,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, int IsInt, std::size_t Size, bool Aligned>
+	template<typename T, precision P, int IsInt, std::size_t Size, bool Aligned>
 	struct compute_vec4_bitwise_not
 	{
 		GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const & v)
@@ -155,7 +155,7 @@ namespace detail
 	// -- Implicit basic constructors --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, T, P>::vec()
 #			ifndef GLM_FORCE_NO_CTOR_INIT
 				: x(0), y(0), z(0), w(0)
@@ -164,38 +164,38 @@ namespace detail
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, T, P>::vec(vec<4, T, P> const & v)
 			: x(v.x), y(v.y), z(v.z), w(v.w)
 		{}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <precision Q>
+	template<typename T, precision P>
+	template<precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, T, P>::vec(vec<4, T, Q> const & v)
 		: x(v.x), y(v.y), z(v.z), w(v.w)
 	{}
 
 	// -- Explicit basic constructors --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, T, P>::vec(ctor)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, T, P>::vec(T scalar)
 		: x(scalar), y(scalar), z(scalar), w(scalar)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, T, P>::vec(T a, T b, T c, T d)
 		: x(a), y(b), z(c), w(d)
 	{}
 
 	// -- Conversion scalar constructors --
 
-	template <typename T, precision P>
-	template <typename A, typename B, typename C, typename D>
+	template<typename T, precision P>
+	template<typename A, typename B, typename C, typename D>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, T, P>::vec(A a, B b, C c, D d) :
 		x(static_cast<T>(a)),
 		y(static_cast<T>(b)),
@@ -203,8 +203,8 @@ namespace detail
 		w(static_cast<T>(d))
 	{}
 
-	template <typename T, precision P>
-	template <typename A, typename B, typename C, typename D>
+	template<typename T, precision P>
+	template<typename A, typename B, typename C, typename D>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR vec<4, T, P>::vec(vec<1, A, P> const & a, vec<1, B, P> const & b, vec<1, C, P> const & c, vec<1, D, P> const & d) :
 		x(static_cast<T>(a.x)),
 		y(static_cast<T>(b.x)),
@@ -214,8 +214,8 @@ namespace detail
 
 	// -- Conversion vector constructors --
 
-	template <typename T, precision P>
-	template <typename A, typename B, typename C, precision Q>
+	template<typename T, precision P>
+	template<typename A, typename B, typename C, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<2, A, Q> const & a, B b, C c) :
 		x(static_cast<T>(a.x)),
 		y(static_cast<T>(a.y)),
@@ -223,8 +223,8 @@ namespace detail
 		w(static_cast<T>(c))
 	{}
 
-	template <typename T, precision P>
-	template <typename A, typename B, typename C, precision Q>
+	template<typename T, precision P>
+	template<typename A, typename B, typename C, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<2, A, Q> const & a, vec<1, B, Q> const & b, vec<1, C, Q> const & c) :
 		x(static_cast<T>(a.x)),
 		y(static_cast<T>(a.y)),
@@ -232,8 +232,8 @@ namespace detail
 		w(static_cast<T>(c.x))
 	{}
 
-	template <typename T, precision P>
-	template <typename A, typename B, typename C, precision Q>
+	template<typename T, precision P>
+	template<typename A, typename B, typename C, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(A s1, vec<2, B, Q> const & v, C s2) :
 		x(static_cast<T>(s1)),
 		y(static_cast<T>(v.x)),
@@ -241,8 +241,8 @@ namespace detail
 		w(static_cast<T>(s2))
 	{}
 
-	template <typename T, precision P>
-	template <typename A, typename B, typename C, precision Q>
+	template<typename T, precision P>
+	template<typename A, typename B, typename C, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<1, A, Q> const & a, vec<2, B, Q> const & b, vec<1, C, Q> const & c) :
 		x(static_cast<T>(a.x)),
 		y(static_cast<T>(b.x)),
@@ -250,8 +250,8 @@ namespace detail
 		w(static_cast<T>(c.x))
 	{}
 
-	template <typename T, precision P>
-	template <typename A, typename B, typename C, precision Q>
+	template<typename T, precision P>
+	template<typename A, typename B, typename C, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(A s1, B s2, vec<2, C, Q> const & v) :
 		x(static_cast<T>(s1)),
 		y(static_cast<T>(s2)),
@@ -259,8 +259,8 @@ namespace detail
 		w(static_cast<T>(v.y))
 	{}
 
-	template <typename T, precision P>
-	template <typename A, typename B, typename C, precision Q>
+	template<typename T, precision P>
+	template<typename A, typename B, typename C, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<1, A, Q> const & a, vec<1, B, Q> const & b, vec<2, C, Q> const & c) :
 		x(static_cast<T>(a.x)),
 		y(static_cast<T>(b.x)),
@@ -268,8 +268,8 @@ namespace detail
 		w(static_cast<T>(c.y))
 	{}
 
-	template <typename T, precision P>
-	template <typename A, typename B, precision Q>
+	template<typename T, precision P>
+	template<typename A, typename B, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<3, A, Q> const & a, B b) :
 		x(static_cast<T>(a.x)),
 		y(static_cast<T>(a.y)),
@@ -277,8 +277,8 @@ namespace detail
 		w(static_cast<T>(b))
 	{}
 
-	template <typename T, precision P>
-	template <typename A, typename B, precision Q>
+	template<typename T, precision P>
+	template<typename A, typename B, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<3, A, Q> const & a, vec<1, B, Q> const & b) :
 		x(static_cast<T>(a.x)),
 		y(static_cast<T>(a.y)),
@@ -286,8 +286,8 @@ namespace detail
 		w(static_cast<T>(b.x))
 	{}
 
-	template <typename T, precision P>
-	template <typename A, typename B, precision Q>
+	template<typename T, precision P>
+	template<typename A, typename B, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(A a, vec<3, B, Q> const & b) :
 		x(static_cast<T>(a)),
 		y(static_cast<T>(b.x)),
@@ -295,8 +295,8 @@ namespace detail
 		w(static_cast<T>(b.z))
 	{}
 
-	template <typename T, precision P>
-	template <typename A, typename B, precision Q>
+	template<typename T, precision P>
+	template<typename A, typename B, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<1, A, Q> const & a, vec<3, B, Q> const & b) :
 		x(static_cast<T>(a.x)),
 		y(static_cast<T>(b.x)),
@@ -304,8 +304,8 @@ namespace detail
 		w(static_cast<T>(b.z))
 	{}
 
-	template <typename T, precision P>
-	template <typename A, typename B, precision Q>
+	template<typename T, precision P>
+	template<typename A, typename B, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<2, A, Q> const & a, vec<2, B, Q> const & b) :
 		x(static_cast<T>(a.x)),
 		y(static_cast<T>(a.y)),
@@ -313,8 +313,8 @@ namespace detail
 		w(static_cast<T>(b.y))
 	{}
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, P>::vec(vec<4, U, Q> const & v) :
 		x(static_cast<T>(v.x)),
 		y(static_cast<T>(v.y)),
@@ -324,14 +324,14 @@ namespace detail
 
 	// -- Component accesses --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T & vec<4, T, P>::operator[](typename vec<4, T, P>::length_type i)
 	{
 		assert(i >= 0 && i < this->length());
 		return (&x)[i];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T const & vec<4, T, P>::operator[](typename vec<4, T, P>::length_type i) const
 	{
 		assert(i >= 0 && i < this->length());
@@ -341,7 +341,7 @@ namespace detail
 	// -- Unary arithmetic operators --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER vec<4, T, P>& vec<4, T, P>::operator=(vec<4, T, P> const & v)
 		{
 			this->x = v.x;
@@ -352,8 +352,8 @@ namespace detail
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P>& vec<4, T, P>::operator=(vec<4, U, P> const & v)
 	{
 		this->x = static_cast<T>(v.x);
@@ -363,85 +363,85 @@ namespace detail
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator+=(U scalar)
 	{
 		return (*this = detail::compute_vec4_add<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator+=(vec<1, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_add<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v.x)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator+=(vec<4, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_add<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator-=(U scalar)
 	{
 		return (*this = detail::compute_vec4_sub<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator-=(vec<1, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_sub<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v.x)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator-=(vec<4, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_sub<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator*=(U scalar)
 	{
 		return (*this = detail::compute_vec4_mul<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator*=(vec<1, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_mul<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v.x)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator*=(vec<4, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_mul<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator/=(U scalar)
 	{
 		return (*this = detail::compute_vec4_div<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator/=(vec<1, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_div<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v.x)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator/=(vec<4, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_div<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v)));
@@ -449,7 +449,7 @@ namespace detail
 
 	// -- Increment and decrement operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator++()
 	{
 		++this->x;
@@ -459,7 +459,7 @@ namespace detail
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator--()
 	{
 		--this->x;
@@ -469,7 +469,7 @@ namespace detail
 		return *this;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> vec<4, T, P>::operator++(int)
 	{
 		vec<4, T, P> Result(*this);
@@ -477,7 +477,7 @@ namespace detail
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> vec<4, T, P>::operator--(int)
 	{
 		vec<4, T, P> Result(*this);
@@ -487,127 +487,127 @@ namespace detail
 
 	// -- Unary bit operators --
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator%=(U scalar)
 	{
 		return (*this = detail::compute_vec4_mod<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator%=(vec<1, U, P> const& v)
 	{
 		return (*this = detail::compute_vec4_mod<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator%=(vec<4, U, P> const& v)
 	{
 		return (*this = detail::compute_vec4_mod<T, P, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator&=(U scalar)
 	{
 		return (*this = detail::compute_vec4_and<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator&=(vec<1, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_and<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator&=(vec<4, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_and<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator|=(U scalar)
 	{
 		return (*this = detail::compute_vec4_or<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator|=(vec<1, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_or<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator|=(vec<4, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_or<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator^=(U scalar)
 	{
 		return (*this = detail::compute_vec4_xor<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator^=(vec<1, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_xor<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator^=(vec<4, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_xor<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator<<=(U scalar)
 	{
 		return (*this = detail::compute_vec4_shift_left<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator<<=(vec<1, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_shift_left<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator<<=(vec<4, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_shift_left<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator>>=(U scalar)
 	{
 		return (*this = detail::compute_vec4_shift_right<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(scalar)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator>>=(vec<1, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_shift_right<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER vec<4, T, P> & vec<4, T, P>::operator>>=(vec<4, U, P> const & v)
 	{
 		return (*this = detail::compute_vec4_shift_right<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(*this, vec<4, T, P>(v)));
@@ -615,13 +615,13 @@ namespace detail
 
 	// -- Unary constant operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator+(vec<4, T, P> const & v)
 	{
 		return v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator-(vec<4, T, P> const & v)
 	{
 		return vec<4, T, P>(0) -= v;
@@ -629,121 +629,121 @@ namespace detail
 
 	// -- Binary arithmetic operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator+(vec<4, T, P> const & v, T scalar)
 	{
 		return vec<4, T, P>(v) += scalar;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator+(vec<4, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) += v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator+(T scalar, vec<4, T, P> const & v)
 	{
 		return vec<4, T, P>(v) += scalar;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator+(vec<1, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v2) += v1;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator+(vec<4, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) += v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator-(vec<4, T, P> const & v, T scalar)
 	{
 		return vec<4, T, P>(v) -= scalar;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator-(vec<4, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) -= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator-(T scalar, vec<4, T, P> const & v)
 	{
 		return vec<4, T, P>(scalar) -= v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator-(vec<1, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1.x) -= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator-(vec<4, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) -= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator*(vec<4, T, P> const & v, T scalar)
 	{
 		return vec<4, T, P>(v) *= scalar;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator*(vec<4, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) *= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator*(T scalar, vec<4, T, P> const & v)
 	{
 		return vec<4, T, P>(v) *= scalar;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator*(vec<1, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v2) *= v1;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator*(vec<4, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) *= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator/(vec<4, T, P> const & v, T scalar)
 	{
 		return vec<4, T, P>(v) /= scalar;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator/(vec<4, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) /= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator/(T scalar, vec<4, T, P> const & v)
 	{
 		return vec<4, T, P>(scalar) /= v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator/(vec<1, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1.x) /= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator/(vec<4, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) /= v2;
@@ -751,187 +751,187 @@ namespace detail
 
 	// -- Binary bit operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator%(vec<4, T, P> const & v, T scalar)
 	{
 		return vec<4, T, P>(v) %= scalar;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator%(vec<4, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) %= v2.x;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator%(T scalar, vec<4, T, P> const & v)
 	{
 		return vec<4, T, P>(scalar) %= v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator%(vec<1, T, P> const & scalar, vec<4, T, P> const & v)
 	{
 		return vec<4, T, P>(scalar.x) %= v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator%(vec<4, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) %= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator&(vec<4, T, P> const & v, T scalar)
 	{
 		return vec<4, T, P>(v) &= scalar;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator&(vec<4, T, P> const & v, vec<1, T, P> const & scalar)
 	{
 		return vec<4, T, P>(v) &= scalar;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator&(T scalar, vec<4, T, P> const & v)
 	{
 		return vec<4, T, P>(scalar) &= v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator&(vec<1, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1.x) &= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator&(vec<4, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) &= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator|(vec<4, T, P> const & v, T scalar)
 	{
 		return vec<4, T, P>(v) |= scalar;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator|(vec<4, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) |= v2.x;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator|(T scalar, vec<4, T, P> const & v)
 	{
 		return vec<4, T, P>(scalar) |= v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator|(vec<1, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1.x) |= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator|(vec<4, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) |= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator^(vec<4, T, P> const & v, T scalar)
 	{
 		return vec<4, T, P>(v) ^= scalar;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator^(vec<4, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) ^= v2.x;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator^(T scalar, vec<4, T, P> const & v)
 	{
 		return vec<4, T, P>(scalar) ^= v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator^(vec<1, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1.x) ^= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator^(vec<4, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) ^= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator<<(vec<4, T, P> const & v, T scalar)
 	{
 		return vec<4, T, P>(v) <<= scalar;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator<<(vec<4, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) <<= v2.x;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator<<(T scalar, vec<4, T, P> const & v)
 	{
 		return vec<4, T, P>(scalar) <<= v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator<<(vec<1, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1.x) <<= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator<<(vec<4, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) <<= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator>>(vec<4, T, P> const & v, T scalar)
 	{
 		return vec<4, T, P>(v) >>= scalar;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator>>(vec<4, T, P> const & v1, vec<1, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) >>= v2.x;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator>>(T scalar, vec<4, T, P> const & v)
 	{
 		return vec<4, T, P>(scalar) >>= v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator>>(vec<1, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1.x) >>= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator>>(vec<4, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return vec<4, T, P>(v1) >>= v2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator~(vec<4, T, P> const & v)
 	{
 		return detail::compute_vec4_bitwise_not<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(v);
@@ -939,25 +939,25 @@ namespace detail
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator==(vec<4, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return detail::compute_vec4_equal<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(v1, v2);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator!=(vec<4, T, P> const & v1, vec<4, T, P> const & v2)
 	{
 		return detail::compute_vec4_nequal<T, P, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<P>::value>::call(v1, v2);
 	}
 
-	template <precision P>
+	template<precision P>
 	GLM_FUNC_QUALIFIER vec<4, bool, P> operator&&(vec<4, bool, P> const & v1, vec<4, bool, P> const & v2)
 	{
 		return vec<4, bool, P>(v1.x && v2.x, v1.y && v2.y, v1.z && v2.z, v1.w && v2.w);
 	}
 
-	template <precision P>
+	template<precision P>
 	GLM_FUNC_QUALIFIER vec<4, bool, P> operator||(vec<4, bool, P> const & v1, vec<4, bool, P> const & v2)
 	{
 		return vec<4, bool, P>(v1.x || v2.x, v1.y || v2.y, v1.z || v2.z, v1.w || v2.w);
diff --git a/glm/detail/type_vec4_simd.inl b/glm/detail/type_vec4_simd.inl
index 48dec09b..3511ed7c 100644
--- a/glm/detail/type_vec4_simd.inl
+++ b/glm/detail/type_vec4_simd.inl
@@ -7,7 +7,7 @@ namespace glm{
 namespace detail
 {
 #	if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
-	template <precision P, int E0, int E1, int E2, int E3>
+	template<precision P, int E0, int E1, int E2, int E3>
 	struct _swizzle_base1<4, float, P, E0,E1,E2,E3, true> : public _swizzle_base0<float, 4>
 	{ 
 		GLM_FUNC_QUALIFIER vec<4, float, P> operator ()()  const
@@ -24,7 +24,7 @@ namespace detail
 		}
 	};
 
-	template <precision P, int E0, int E1, int E2, int E3>
+	template<precision P, int E0, int E1, int E2, int E3>
 	struct _swizzle_base1<4, int32, P, E0,E1,E2,E3, true> : public _swizzle_base0<int32, 4>
 	{ 
 		GLM_FUNC_QUALIFIER vec<4, int32, P> operator ()()  const
@@ -37,7 +37,7 @@ namespace detail
 		}
 	};
 
-	template <precision P, int E0, int E1, int E2, int E3>
+	template<precision P, int E0, int E1, int E2, int E3>
 	struct _swizzle_base1<4, uint32, P, E0,E1,E2,E3, true> : public _swizzle_base0<uint32, 4>
 	{ 
 		GLM_FUNC_QUALIFIER vec<4, uint32, P> operator ()()  const
@@ -51,7 +51,7 @@ namespace detail
 	};
 #	endif// GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
 
-	template <precision P>
+	template<precision P>
 	struct compute_vec4_add<float, P, true>
 	{
 		static vec<4, float, P> call(vec<4, float, P> const & a, vec<4, float, P> const & b)
@@ -63,7 +63,7 @@ namespace detail
 	};
 
 #	if GLM_ARCH & GLM_ARCH_AVX_BIT
-	template <precision P>
+	template<precision P>
 	struct compute_vec4_add<double, P, true>
 	{
 		static vec<4, double, P> call(vec<4, double, P> const & a, vec<4, double, P> const & b)
@@ -75,7 +75,7 @@ namespace detail
 	};
 #	endif
 
-	template <precision P>
+	template<precision P>
 	struct compute_vec4_sub<float, P, true>
 	{
 		static vec<4, float, P> call(vec<4, float, P> const & a, vec<4, float, P> const & b)
@@ -87,7 +87,7 @@ namespace detail
 	};
 
 #	if GLM_ARCH & GLM_ARCH_AVX_BIT
-	template <precision P>
+	template<precision P>
 	struct compute_vec4_sub<double, P, true>
 	{
 		static vec<4, double, P> call(vec<4, double, P> const & a, vec<4, double, P> const & b)
@@ -99,7 +99,7 @@ namespace detail
 	};
 #	endif
 
-	template <precision P>
+	template<precision P>
 	struct compute_vec4_mul<float, P, true>
 	{
 		static vec<4, float, P> call(vec<4, float, P> const & a, vec<4, float, P> const & b)
@@ -111,7 +111,7 @@ namespace detail
 	};
 
 #	if GLM_ARCH & GLM_ARCH_AVX_BIT
-	template <precision P>
+	template<precision P>
 	struct compute_vec4_mul<double, P, true>
 	{
 		static vec<4, double, P> call(vec<4, double, P> const & a, vec<4, double, P> const & b)
@@ -123,7 +123,7 @@ namespace detail
 	};
 #	endif
 
-	template <precision P>
+	template<precision P>
 	struct compute_vec4_div<float, P, true>
 	{
 		static vec<4, float, P> call(vec<4, float, P> const & a, vec<4, float, P> const & b)
@@ -135,7 +135,7 @@ namespace detail
 	};
 
 	#	if GLM_ARCH & GLM_ARCH_AVX_BIT
-	template <precision P>
+	template<precision P>
 	struct compute_vec4_div<double, P, true>
 	{
 		static vec<4, double, P> call(vec<4, double, P> const & a, vec<4, double, P> const & b)
@@ -147,7 +147,7 @@ namespace detail
 	};
 #	endif
 
-	template <>
+	template<>
 	struct compute_vec4_div<float, aligned_lowp, true>
 	{
 		static vec<4, float, aligned_lowp> call(vec<4, float, aligned_lowp> const & a, vec<4, float, aligned_lowp> const & b)
@@ -158,7 +158,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_vec4_and<T, P, true, 32, true>
 	{
 		static vec<4, T, P> call(vec<4, T, P> const& a, vec<4, T, P> const& b)
@@ -170,7 +170,7 @@ namespace detail
 	};
 
 #	if GLM_ARCH & GLM_ARCH_AVX2_BIT
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_vec4_and<T, P, true, 64, true>
 	{
 		static vec<4, T, P> call(vec<4, T, P> const& a, vec<4, T, P> const& b)
@@ -182,7 +182,7 @@ namespace detail
 	};
 #	endif
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_vec4_or<T, P, true, 32, true>
 	{
 		static vec<4, T, P> call(vec<4, T, P> const& a, vec<4, T, P> const& b)
@@ -194,7 +194,7 @@ namespace detail
 	};
 
 #	if GLM_ARCH & GLM_ARCH_AVX2_BIT
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_vec4_or<T, P, true, 64, true>
 	{
 		static vec<4, T, P> call(vec<4, T, P> const& a, vec<4, T, P> const& b)
@@ -206,7 +206,7 @@ namespace detail
 	};
 #	endif
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_vec4_xor<T, P, true, 32, true>
 	{
 		static vec<4, T, P> call(vec<4, T, P> const& a, vec<4, T, P> const& b)
@@ -218,7 +218,7 @@ namespace detail
 	};
 
 #	if GLM_ARCH & GLM_ARCH_AVX2_BIT
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_vec4_xor<T, P, true, 64, true>
 	{
 		static vec<4, T, P> call(vec<4, T, P> const& a, vec<4, T, P> const& b)
@@ -230,7 +230,7 @@ namespace detail
 	};
 #	endif
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_vec4_shift_left<T, P, true, 32, true>
 	{
 		static vec<4, T, P> call(vec<4, T, P> const& a, vec<4, T, P> const& b)
@@ -242,7 +242,7 @@ namespace detail
 	};
 
 #	if GLM_ARCH & GLM_ARCH_AVX2_BIT
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_vec4_shift_left<T, P, true, 64, true>
 	{
 		static vec<4, T, P> call(vec<4, T, P> const& a, vec<4, T, P> const& b)
@@ -254,7 +254,7 @@ namespace detail
 	};
 #	endif
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_vec4_shift_right<T, P, true, 32, true>
 	{
 		static vec<4, T, P> call(vec<4, T, P> const& a, vec<4, T, P> const& b)
@@ -266,7 +266,7 @@ namespace detail
 	};
 
 #	if GLM_ARCH & GLM_ARCH_AVX2_BIT
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_vec4_shift_right<T, P, true, 64, true>
 	{
 		static vec<4, T, P> call(vec<4, T, P> const& a, vec<4, T, P> const& b)
@@ -278,7 +278,7 @@ namespace detail
 	};
 #	endif
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_vec4_bitwise_not<T, P, true, 32, true>
 	{
 		static vec<4, T, P> call(vec<4, T, P> const & v)
@@ -290,7 +290,7 @@ namespace detail
 	};
 
 #	if GLM_ARCH & GLM_ARCH_AVX2_BIT
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_vec4_bitwise_not<T, P, true, 64, true>
 	{
 		static vec<4, T, P> call(vec<4, T, P> const & v)
@@ -302,7 +302,7 @@ namespace detail
 	};
 #	endif
 
-	template <precision P>
+	template<precision P>
 	struct compute_vec4_equal<float, P, false, 32, true>
 	{
 		static bool call(vec<4, float, P> const & v1, vec<4, float, P> const & v2)
@@ -311,7 +311,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_vec4_equal<int32, P, true, 32, true>
 	{
 		static bool call(vec<4, int32, P> const & v1, vec<4, int32, P> const & v2)
@@ -320,7 +320,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_vec4_nequal<float, P, false, 32, true>
 	{
 		static bool call(vec<4, float, P> const & v1, vec<4, float, P> const & v2)
@@ -329,7 +329,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_vec4_nequal<int32, P, true, 32, true>
 	{
 		static bool call(vec<4, int32, P> const & v1, vec<4, int32, P> const & v2)
@@ -340,21 +340,21 @@ namespace detail
 }//namespace detail
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <>
+		template<>
 		GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, float, aligned_lowp>::vec()
 #			ifndef GLM_FORCE_NO_CTOR_INIT
 				: data(_mm_setzero_ps())
 #			endif
 		{}
 
-		template <>
+		template<>
 		GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, float, aligned_mediump>::vec()
 #			ifndef GLM_FORCE_NO_CTOR_INIT
 			: data(_mm_setzero_ps())
 #			endif
 		{}
 
-		template <>
+		template<>
 		GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, float, aligned_highp>::vec()
 #			ifndef GLM_FORCE_NO_CTOR_INIT
 			: data(_mm_setzero_ps())
@@ -362,117 +362,117 @@ namespace detail
 		{}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, float, aligned_lowp>::vec(float s) :
 		data(_mm_set1_ps(s))
 	{}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, float, aligned_mediump>::vec(float s) :
 		data(_mm_set1_ps(s))
 	{}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, float, aligned_highp>::vec(float s) :
 		data(_mm_set1_ps(s))
 	{}
 
 #	if GLM_ARCH & GLM_ARCH_AVX_BIT
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, double, aligned_lowp>::vec(double s) :
 		data(_mm256_set1_pd(s))
 	{}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, double, aligned_mediump>::vec(double s) :
 		data(_mm256_set1_pd(s))
 	{}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, double, aligned_highp>::vec(double s) :
 		data(_mm256_set1_pd(s))
 	{}
 #	endif
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, int32, aligned_lowp>::vec(int32 s) :
 		data(_mm_set1_epi32(s))
 	{}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, int32, aligned_mediump>::vec(int32 s) :
 		data(_mm_set1_epi32(s))
 	{}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, int32, aligned_highp>::vec(int32 s) :
 		data(_mm_set1_epi32(s))
 	{}
 
 #	if GLM_ARCH & GLM_ARCH_AVX2_BIT
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, int64, aligned_lowp>::vec(int64 s) :
 		data(_mm256_set1_epi64x(s))
 	{}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, int64, aligned_mediump>::vec(int64 s) :
 		data(_mm256_set1_epi64x(s))
 	{}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, int64, aligned_highp>::vec(int64 s) :
 		data(_mm256_set1_epi64x(s))
 	{}
 #	endif
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, float, aligned_lowp>::vec(float a, float b, float c, float d) :
 		data(_mm_set_ps(d, c, b, a))
 	{}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, float, aligned_mediump>::vec(float a, float b, float c, float d) :
 		data(_mm_set_ps(d, c, b, a))
 	{}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, float, aligned_highp>::vec(float a, float b, float c, float d) :
 		data(_mm_set_ps(d, c, b, a))
 	{}
 
-	template <>
-	template <>
+	template<>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, int32, aligned_lowp>::vec(int32 a, int32 b, int32 c, int32 d) :
 		data(_mm_set_epi32(d, c, b, a))
 	{}
 
-	template <>
-	template <>
+	template<>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, int32, aligned_mediump>::vec(int32 a, int32 b, int32 c, int32 d) :
 		data(_mm_set_epi32(d, c, b, a))
 	{}
 
-	template <>
-	template <>
+	template<>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, int32, aligned_highp>::vec(int32 a, int32 b, int32 c, int32 d) :
 		data(_mm_set_epi32(d, c, b, a))
 	{}
 
-	template <>
-	template <>
+	template<>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, float, aligned_lowp>::vec(int32 a, int32 b, int32 c, int32 d) :
 		data(_mm_castsi128_ps(_mm_set_epi32(d, c, b, a)))
 	{}
 
-	template <>
-	template <>
+	template<>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, float, aligned_mediump>::vec(int32 a, int32 b, int32 c, int32 d) :
 		data(_mm_castsi128_ps(_mm_set_epi32(d, c, b, a)))
 	{}
 
-	template <>
-	template <>
+	template<>
+	template<>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD vec<4, float, aligned_highp>::vec(int32 a, int32 b, int32 c, int32 d) :
 		data(_mm_castsi128_ps(_mm_set_epi32(d, c, b, a)))
 	{}
diff --git a/glm/fwd.hpp b/glm/fwd.hpp
index dd9a16de..04c7c5a7 100644
--- a/glm/fwd.hpp
+++ b/glm/fwd.hpp
@@ -12,7 +12,7 @@
 // GLM_GTC_quaternion
 namespace glm
 {
-	template <typename T, precision P> struct tquat;
+	template<typename T, precision P> struct tquat;
 
 	/// Quaternion of low single-precision floating-point numbers.
 	///
diff --git a/glm/gtc/bitfield.hpp b/glm/gtc/bitfield.hpp
index 9382e2a6..8a34139b 100644
--- a/glm/gtc/bitfield.hpp
+++ b/glm/gtc/bitfield.hpp
@@ -32,62 +32,62 @@ namespace glm
 	/// Build a mask of 'count' bits
 	///
 	/// @see gtc_bitfield
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL genIUType mask(genIUType Bits);
 	
 	/// Build a mask of 'count' bits
 	///
 	/// @see gtc_bitfield
-	template <typename T, precision P, template <typename, precision> class vecIUType>
+	template<typename T, precision P, template<typename, precision> class vecIUType>
 	GLM_FUNC_DECL vecIUType<T, P> mask(vecIUType<T, P> const & v);
 
 	/// Rotate all bits to the right. All the bits dropped in the right side are inserted back on the left side.
 	///
 	/// @see gtc_bitfield
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL genIUType bitfieldRotateRight(genIUType In, int Shift);
 
 	/// Rotate all bits to the right. All the bits dropped in the right side are inserted back on the left side.
 	///
 	/// @see gtc_bitfield
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> bitfieldRotateRight(vecType<D, T, P> const & In, int Shift);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> bitfieldRotateRight(vecType<L, T, P> const & In, int Shift);
 
 	/// Rotate all bits to the left. All the bits dropped in the left side are inserted back on the right side.
 	///
 	/// @see gtc_bitfield
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL genIUType bitfieldRotateLeft(genIUType In, int Shift);
 
 	/// Rotate all bits to the left. All the bits dropped in the left side are inserted back on the right side.
 	///
 	/// @see gtc_bitfield
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> bitfieldRotateLeft(vecType<D, T, P> const & In, int Shift);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> bitfieldRotateLeft(vecType<L, T, P> const & In, int Shift);
 
 	/// Set to 1 a range of bits.
 	///
 	/// @see gtc_bitfield
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL genIUType bitfieldFillOne(genIUType Value, int FirstBit, int BitCount);
 
 	/// Set to 1 a range of bits.
 	///
 	/// @see gtc_bitfield
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> bitfieldFillOne(vecType<D, T, P> const & Value, int FirstBit, int BitCount);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> bitfieldFillOne(vecType<L, T, P> const & Value, int FirstBit, int BitCount);
 
 	/// Set to 0 a range of bits.
 	///
 	/// @see gtc_bitfield
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL genIUType bitfieldFillZero(genIUType Value, int FirstBit, int BitCount);
 
 	/// Set to 0 a range of bits.
 	///
 	/// @see gtc_bitfield
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> bitfieldFillZero(vecType<D, T, P> const & Value, int FirstBit, int BitCount);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> bitfieldFillZero(vecType<L, T, P> const & Value, int FirstBit, int BitCount);
 
 	/// Interleaves the bits of x and y.
 	/// The first bit is the first bit of x followed by the first bit of y.
diff --git a/glm/gtc/bitfield.inl b/glm/gtc/bitfield.inl
index 6606efbd..4331eec5 100644
--- a/glm/gtc/bitfield.inl
+++ b/glm/gtc/bitfield.inl
@@ -6,16 +6,16 @@
 namespace glm{
 namespace detail
 {
-	template <typename PARAM, typename RET>
+	template<typename PARAM, typename RET>
 	GLM_FUNC_DECL RET bitfieldInterleave(PARAM x, PARAM y);
 
-	template <typename PARAM, typename RET>
+	template<typename PARAM, typename RET>
 	GLM_FUNC_DECL RET bitfieldInterleave(PARAM x, PARAM y, PARAM z);
 
-	template <typename PARAM, typename RET>
+	template<typename PARAM, typename RET>
 	GLM_FUNC_DECL RET bitfieldInterleave(PARAM x, PARAM y, PARAM z, PARAM w);
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER glm::uint16 bitfieldInterleave(glm::uint8 x, glm::uint8 y)
 	{
 		glm::uint16 REG1(x);
@@ -33,7 +33,7 @@ namespace detail
 		return REG1 | (REG2 << 1);
 	}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER glm::uint32 bitfieldInterleave(glm::uint16 x, glm::uint16 y)
 	{
 		glm::uint32 REG1(x);
@@ -54,7 +54,7 @@ namespace detail
 		return REG1 | (REG2 << 1);
 	}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER glm::uint64 bitfieldInterleave(glm::uint32 x, glm::uint32 y)
 	{
 		glm::uint64 REG1(x);
@@ -78,7 +78,7 @@ namespace detail
 		return REG1 | (REG2 << 1);
 	}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER glm::uint32 bitfieldInterleave(glm::uint8 x, glm::uint8 y, glm::uint8 z)
 	{
 		glm::uint32 REG1(x);
@@ -104,7 +104,7 @@ namespace detail
 		return REG1 | (REG2 << 1) | (REG3 << 2);
 	}
 		
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER glm::uint64 bitfieldInterleave(glm::uint16 x, glm::uint16 y, glm::uint16 z)
 	{
 		glm::uint64 REG1(x);
@@ -134,7 +134,7 @@ namespace detail
 		return REG1 | (REG2 << 1) | (REG3 << 2);
 	}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER glm::uint64 bitfieldInterleave(glm::uint32 x, glm::uint32 y, glm::uint32 z)
 	{
 		glm::uint64 REG1(x);
@@ -164,7 +164,7 @@ namespace detail
 		return REG1 | (REG2 << 1) | (REG3 << 2);
 	}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER glm::uint32 bitfieldInterleave(glm::uint8 x, glm::uint8 y, glm::uint8 z, glm::uint8 w)
 	{
 		glm::uint32 REG1(x);
@@ -190,7 +190,7 @@ namespace detail
 		return REG1 | (REG2 << 1) | (REG3 << 2) | (REG4 << 3);
 	}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER glm::uint64 bitfieldInterleave(glm::uint16 x, glm::uint16 y, glm::uint16 z, glm::uint16 w)
 	{
 		glm::uint64 REG1(x);
@@ -222,7 +222,7 @@ namespace detail
 	}
 }//namespace detail
 
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER genIUType mask(genIUType Bits)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'mask' accepts only integer values");
@@ -230,15 +230,15 @@ namespace detail
 		return Bits >= sizeof(genIUType) * 8 ? ~static_cast<genIUType>(0) : (static_cast<genIUType>(1) << Bits) - static_cast<genIUType>(1);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecIUType>
-	GLM_FUNC_QUALIFIER vecIUType<D, T, P> mask(vecIUType<D, T, P> const& v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecIUType>
+	GLM_FUNC_QUALIFIER vecIUType<L, T, P> mask(vecIUType<L, T, P> const& v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'mask' accepts only integer values");
 
-		return detail::functor1<D, T, T, P>::call(mask, v);
+		return detail::functor1<L, T, T, P>::call(mask, v);
 	}
 
-	template <typename genIType>
+	template<typename genIType>
 	GLM_FUNC_QUALIFIER genIType bitfieldRotateRight(genIType In, int Shift)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genIType>::is_integer, "'bitfieldRotateRight' accepts only integer values");
@@ -247,8 +247,8 @@ namespace detail
 		return (In << static_cast<genIType>(Shift)) | (In >> static_cast<genIType>(BitSize - Shift));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> bitfieldRotateRight(vecType<D, T, P> const & In, int Shift)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> bitfieldRotateRight(vecType<L, T, P> const & In, int Shift)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitfieldRotateRight' accepts only integer values");
 
@@ -256,7 +256,7 @@ namespace detail
 		return (In << static_cast<T>(Shift)) | (In >> static_cast<T>(BitSize - Shift));
 	}
 
-	template <typename genIType>
+	template<typename genIType>
 	GLM_FUNC_QUALIFIER genIType bitfieldRotateLeft(genIType In, int Shift)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genIType>::is_integer, "'bitfieldRotateLeft' accepts only integer values");
@@ -265,8 +265,8 @@ namespace detail
 		return (In >> static_cast<genIType>(Shift)) | (In << static_cast<genIType>(BitSize - Shift));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> bitfieldRotateLeft(vecType<D, T, P> const& In, int Shift)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> bitfieldRotateLeft(vecType<L, T, P> const& In, int Shift)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitfieldRotateLeft' accepts only integer values");
 
@@ -274,26 +274,26 @@ namespace detail
 		return (In >> static_cast<T>(Shift)) | (In << static_cast<T>(BitSize - Shift));
 	}
 
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER genIUType bitfieldFillOne(genIUType Value, int FirstBit, int BitCount)
 	{
 		return Value | static_cast<genIUType>(mask(BitCount) << FirstBit);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> bitfieldFillOne(vecType<D, T, P> const& Value, int FirstBit, int BitCount)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> bitfieldFillOne(vecType<L, T, P> const& Value, int FirstBit, int BitCount)
 	{
 		return Value | static_cast<T>(mask(BitCount) << FirstBit);
 	}
 
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER genIUType bitfieldFillZero(genIUType Value, int FirstBit, int BitCount)
 	{
 		return Value & static_cast<genIUType>(~(mask(BitCount) << FirstBit));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> bitfieldFillZero(vecType<D, T, P> const& Value, int FirstBit, int BitCount)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> bitfieldFillZero(vecType<L, T, P> const& Value, int FirstBit, int BitCount)
 	{
 		return Value & static_cast<T>(~(mask(BitCount) << FirstBit));
 	}
diff --git a/glm/gtc/color_space.hpp b/glm/gtc/color_space.hpp
index 97ddb7f1..da300d93 100644
--- a/glm/gtc/color_space.hpp
+++ b/glm/gtc/color_space.hpp
@@ -32,23 +32,23 @@ namespace glm
 
 	/// Convert a linear color to sRGB color using a standard gamma correction.
 	/// IEC 61966-2-1:1999 / Rec. 709 specification https://www.w3.org/Graphics/Color/srgb
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> convertLinearToSRGB(vecType<D, T, P> const & ColorLinear);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> convertLinearToSRGB(vecType<L, T, P> const & ColorLinear);
 
 	/// Convert a linear color to sRGB color using a custom gamma correction.
 	/// IEC 61966-2-1:1999 / Rec. 709 specification https://www.w3.org/Graphics/Color/srgb
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> convertLinearToSRGB(vecType<D, T, P> const & ColorLinear, T Gamma);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> convertLinearToSRGB(vecType<L, T, P> const & ColorLinear, T Gamma);
 
 	/// Convert a sRGB color to linear color using a standard gamma correction.
 	/// IEC 61966-2-1:1999 / Rec. 709 specification https://www.w3.org/Graphics/Color/srgb
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> convertSRGBToLinear(vecType<D, T, P> const & ColorSRGB);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> convertSRGBToLinear(vecType<L, T, P> const & ColorSRGB);
 
 	/// Convert a sRGB color to linear color using a custom gamma correction.
 	// IEC 61966-2-1:1999 / Rec. 709 specification https://www.w3.org/Graphics/Color/srgb
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> convertSRGBToLinear(vecType<D, T, P> const & ColorSRGB, T Gamma);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> convertSRGBToLinear(vecType<L, T, P> const & ColorSRGB, T Gamma);
 
 	/// @}
 } //namespace glm
diff --git a/glm/gtc/color_space.inl b/glm/gtc/color_space.inl
index 90594a7d..b9475bd2 100644
--- a/glm/gtc/color_space.inl
+++ b/glm/gtc/color_space.inl
@@ -4,21 +4,21 @@
 namespace glm{
 namespace detail
 {
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	struct compute_rgbToSrgb
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const& ColorRGB, T GammaCorrection)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const& ColorRGB, T GammaCorrection)
 		{
-			vecType<D, T, P> const ClampedColor(clamp(ColorRGB, static_cast<T>(0), static_cast<T>(1)));
+			vecType<L, T, P> const ClampedColor(clamp(ColorRGB, static_cast<T>(0), static_cast<T>(1)));
 
 			return mix(
-				pow(ClampedColor, vecType<D, T, P>(GammaCorrection)) * static_cast<T>(1.055) - static_cast<T>(0.055),
+				pow(ClampedColor, vecType<L, T, P>(GammaCorrection)) * static_cast<T>(1.055) - static_cast<T>(0.055),
 				ClampedColor * static_cast<T>(12.92),
-				lessThan(ClampedColor, vecType<D, T, P>(static_cast<T>(0.0031308))));
+				lessThan(ClampedColor, vecType<L, T, P>(static_cast<T>(0.0031308))));
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_rgbToSrgb<4, T, P, vec>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const& ColorRGB, T GammaCorrection)
@@ -27,19 +27,19 @@ namespace detail
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	struct compute_srgbToRgb
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const& ColorSRGB, T Gamma)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const& ColorSRGB, T Gamma)
 		{
 			return mix(
-				pow((ColorSRGB + static_cast<T>(0.055)) * static_cast<T>(0.94786729857819905213270142180095), vecType<D, T, P>(Gamma)),
+				pow((ColorSRGB + static_cast<T>(0.055)) * static_cast<T>(0.94786729857819905213270142180095), vecType<L, T, P>(Gamma)),
 				ColorSRGB * static_cast<T>(0.07739938080495356037151702786378),
-				lessThanEqual(ColorSRGB, vecType<D, T, P>(static_cast<T>(0.04045))));
+				lessThanEqual(ColorSRGB, vecType<L, T, P>(static_cast<T>(0.04045))));
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_srgbToRgb<4, T, P, vec>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, T, P> call(vec<4, T, P> const& ColorSRGB, T Gamma)
@@ -49,14 +49,14 @@ namespace detail
 	};
 }//namespace detail
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> convertLinearToSRGB(vecType<D, T, P> const& ColorLinear)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> convertLinearToSRGB(vecType<L, T, P> const& ColorLinear)
 	{
-		return detail::compute_rgbToSrgb<D, T, P, vecType>::call(ColorLinear, static_cast<T>(0.41666));
+		return detail::compute_rgbToSrgb<L, T, P, vecType>::call(ColorLinear, static_cast<T>(0.41666));
 	}
 
 	// Based on Ian Taylor http://chilliant.blogspot.fr/2012/08/srgb-approximations-for-hlsl.html
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER vec<3, float, lowp> convertLinearToSRGB(vec<3, float, lowp> const& ColorLinear)
 	{
 		vec<3, float, lowp> S1 = sqrt(ColorLinear);
@@ -65,21 +65,21 @@ namespace detail
 		return 0.662002687f * S1 + 0.684122060f * S2 - 0.323583601f * S3 - 0.0225411470f * ColorLinear;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> convertLinearToSRGB(vecType<D, T, P> const& ColorLinear, T Gamma)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> convertLinearToSRGB(vecType<L, T, P> const& ColorLinear, T Gamma)
 	{
-		return detail::compute_rgbToSrgb<D, T, P, vecType>::call(ColorLinear, static_cast<T>(1) / Gamma);
+		return detail::compute_rgbToSrgb<L, T, P, vecType>::call(ColorLinear, static_cast<T>(1) / Gamma);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> convertSRGBToLinear(vecType<D, T, P> const& ColorSRGB)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> convertSRGBToLinear(vecType<L, T, P> const& ColorSRGB)
 	{
-		return detail::compute_srgbToRgb<D, T, P, vecType>::call(ColorSRGB, static_cast<T>(2.4));
+		return detail::compute_srgbToRgb<L, T, P, vecType>::call(ColorSRGB, static_cast<T>(2.4));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> convertSRGBToLinear(vecType<D, T, P> const& ColorSRGB, T Gamma)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> convertSRGBToLinear(vecType<L, T, P> const& ColorSRGB, T Gamma)
 	{
-		return detail::compute_srgbToRgb<D, T, P, vecType>::call(ColorSRGB, Gamma);
+		return detail::compute_srgbToRgb<L, T, P, vecType>::call(ColorSRGB, Gamma);
 	}
 }//namespace glm
diff --git a/glm/gtc/constants.hpp b/glm/gtc/constants.hpp
index 059b6c5b..dd8f2856 100644
--- a/glm/gtc/constants.hpp
+++ b/glm/gtc/constants.hpp
@@ -26,147 +26,147 @@ namespace glm
 
 	/// Return the epsilon constant for floating point types.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType epsilon();
 
 	/// Return 0.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType zero();
 
 	/// Return 1.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType one();
 
 	/// Return the pi constant.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType pi();
 
 	/// Return pi * 2.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType two_pi();
 
 	/// Return square root of pi.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType root_pi();
 
 	/// Return pi / 2.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType half_pi();
 
 	/// Return pi / 2 * 3.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType three_over_two_pi();
 
 	/// Return pi / 4.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType quarter_pi();
 
 	/// Return 1 / pi.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_pi();
 
 	/// Return 1 / (pi * 2).
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_two_pi();
 
 	/// Return 2 / pi.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType two_over_pi();
 
 	/// Return 4 / pi.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType four_over_pi();
 
 	/// Return 2 / sqrt(pi).
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType two_over_root_pi();
 
 	/// Return 1 / sqrt(2).
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_root_two();
 
 	/// Return sqrt(pi / 2).
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType root_half_pi();
 
 	/// Return sqrt(2 * pi).
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType root_two_pi();
 
 	/// Return sqrt(ln(4)).
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType root_ln_four();
 
 	/// Return e constant.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType e();
 
 	/// Return Euler's constant.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType euler();
 
 	/// Return sqrt(2).
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType root_two();
 
 	/// Return sqrt(3).
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType root_three();
 
 	/// Return sqrt(5).
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType root_five();
 
 	/// Return ln(2).
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType ln_two();
 
 	/// Return ln(10).
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType ln_ten();
 
 	/// Return ln(ln(2)).
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType ln_ln_two();
 
 	/// Return 1 / 3.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType third();
 
 	/// Return 2 / 3.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType two_thirds();
 
 	/// Return the golden ratio constant.
 	/// @see gtc_constants
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL GLM_CONSTEXPR genType golden_ratio();
 
 	/// @}
diff --git a/glm/gtc/constants.inl b/glm/gtc/constants.inl
index cb451d0d..2ea10855 100644
--- a/glm/gtc/constants.inl
+++ b/glm/gtc/constants.inl
@@ -5,175 +5,175 @@
 
 namespace glm
 {
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType epsilon()
 	{
 		return std::numeric_limits<genType>::epsilon();
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType zero()
 	{
 		return genType(0);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType one()
 	{
 		return genType(1);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType pi()
 	{
 		return genType(3.14159265358979323846264338327950288);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType two_pi()
 	{
 		return genType(6.28318530717958647692528676655900576);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType root_pi()
 	{
 		return genType(1.772453850905516027);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType half_pi()
 	{
 		return genType(1.57079632679489661923132169163975144);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType three_over_two_pi()
 	{
 		return genType(4.71238898038468985769396507491925432);           
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType quarter_pi()
 	{
 		return genType(0.785398163397448309615660845819875721);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType one_over_pi()
 	{
 		return genType(0.318309886183790671537767526745028724);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType one_over_two_pi()
 	{
 		return genType(0.159154943091895335768883763372514362);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType two_over_pi()
 	{
 		return genType(0.636619772367581343075535053490057448);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType four_over_pi()
 	{
 		return genType(1.273239544735162686151070106980114898);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType two_over_root_pi()
 	{
 		return genType(1.12837916709551257389615890312154517);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType one_over_root_two()
 	{
 		return genType(0.707106781186547524400844362104849039);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType root_half_pi()
 	{
 		return genType(1.253314137315500251);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType root_two_pi()
 	{
 		return genType(2.506628274631000502);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType root_ln_four()
 	{
 		return genType(1.17741002251547469);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType e()
 	{
 		return genType(2.71828182845904523536);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType euler()
 	{
 		return genType(0.577215664901532860606);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType root_two()
 	{
 		return genType(1.41421356237309504880168872420969808);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType root_three()
 	{
 		return genType(1.73205080756887729352744634150587236);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType root_five()
 	{
 		return genType(2.23606797749978969640917366873127623);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType ln_two()
 	{
 		return genType(0.693147180559945309417232121458176568);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType ln_ten()
 	{
 		return genType(2.30258509299404568401799145468436421);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType ln_ln_two()
 	{
 		return genType(-0.3665129205816643);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType third()
 	{
 		return genType(0.3333333333333333333333333333333333333333);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType two_thirds()
 	{
 		return genType(0.666666666666666666666666666666666666667);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType golden_ratio()
 	{
 		return genType(1.61803398874989484820458683436563811);
diff --git a/glm/gtc/epsilon.hpp b/glm/gtc/epsilon.hpp
index 4b87f9d4..5510daf2 100644
--- a/glm/gtc/epsilon.hpp
+++ b/glm/gtc/epsilon.hpp
@@ -30,17 +30,17 @@ namespace glm
 	/// True if this expression is satisfied.
 	///
 	/// @see gtc_epsilon
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, bool, P> epsilonEqual(
-		vecType<D, T, P> const & x,
-		vecType<D, T, P> const & y,
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, bool, P> epsilonEqual(
+		vecType<L, T, P> const& x,
+		vecType<L, T, P> const& y,
 		T const & epsilon);
 
 	/// Returns the component-wise comparison of |x - y| < epsilon.
 	/// True if this expression is satisfied.
 	///
 	/// @see gtc_epsilon
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL bool epsilonEqual(
 		genType const & x,
 		genType const & y,
@@ -50,7 +50,7 @@ namespace glm
 	/// True if this expression is not satisfied.
 	///
 	/// @see gtc_epsilon
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL typename genType::boolType epsilonNotEqual(
 		genType const & x,
 		genType const & y,
@@ -60,7 +60,7 @@ namespace glm
 	/// True if this expression is not satisfied.
 	///
 	/// @see gtc_epsilon
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL bool epsilonNotEqual(
 		genType const & x,
 		genType const & y,
diff --git a/glm/gtc/epsilon.inl b/glm/gtc/epsilon.inl
index b0e77cd9..fd86b7ad 100644
--- a/glm/gtc/epsilon.inl
+++ b/glm/gtc/epsilon.inl
@@ -11,7 +11,7 @@
 
 namespace glm
 {
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER bool epsilonEqual
 	(
 		float const & x,
@@ -22,7 +22,7 @@ namespace glm
 		return abs(x - y) < epsilon;
 	}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER bool epsilonEqual
 	(
 		double const & x,
@@ -33,7 +33,7 @@ namespace glm
 		return abs(x - y) < epsilon;
 	}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER bool epsilonNotEqual
 	(
 		float const & x,
@@ -44,7 +44,7 @@ namespace glm
 		return abs(x - y) >= epsilon;
 	}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER bool epsilonNotEqual
 	(
 		double const & x,
@@ -55,51 +55,51 @@ namespace glm
 		return abs(x - y) >= epsilon;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> epsilonEqual
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> epsilonEqual
 	(
-		vecType<D, T, P> const & x,
-		vecType<D, T, P> const & y,
+		vecType<L, T, P> const& x,
+		vecType<L, T, P> const& y,
 		T const & epsilon
 	)
 	{
-		return lessThan(abs(x - y), vecType<D, T, P>(epsilon));
+		return lessThan(abs(x - y), vecType<L, T, P>(epsilon));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> epsilonEqual
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> epsilonEqual
 	(
-		vecType<D, T, P> const & x,
-		vecType<D, T, P> const & y,
-		vecType<D, T, P> const & epsilon
+		vecType<L, T, P> const& x,
+		vecType<L, T, P> const& y,
+		vecType<L, T, P> const& epsilon
 	)
 	{
-		return lessThan(abs(x - y), vecType<D, T, P>(epsilon));
+		return lessThan(abs(x - y), vecType<L, T, P>(epsilon));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> epsilonNotEqual
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> epsilonNotEqual
 	(
-		vecType<D, T, P> const & x,
-		vecType<D, T, P> const & y,
+		vecType<L, T, P> const& x,
+		vecType<L, T, P> const& y,
 		T const & epsilon
 	)
 	{
-		return greaterThanEqual(abs(x - y), vecType<D, T, P>(epsilon));
+		return greaterThanEqual(abs(x - y), vecType<L, T, P>(epsilon));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> epsilonNotEqual
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> epsilonNotEqual
 	(
-		vecType<D, T, P> const & x,
-		vecType<D, T, P> const & y,
-		vecType<D, T, P> const & epsilon
+		vecType<L, T, P> const& x,
+		vecType<L, T, P> const& y,
+		vecType<L, T, P> const& epsilon
 	)
 	{
-		return greaterThanEqual(abs(x - y), vecType<D, T, P>(epsilon));
+		return greaterThanEqual(abs(x - y), vecType<L, T, P>(epsilon));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, bool, P> epsilonEqual
 	(
 		tquat<T, P> const & x,
@@ -111,7 +111,7 @@ namespace glm
 		return lessThan(abs(v), vec<4, T, P>(epsilon));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, bool, P> epsilonNotEqual
 	(
 		tquat<T, P> const & x,
diff --git a/glm/gtc/functions.hpp b/glm/gtc/functions.hpp
index 3b42628f..89048cc1 100644
--- a/glm/gtc/functions.hpp
+++ b/glm/gtc/functions.hpp
@@ -30,7 +30,7 @@ namespace glm
 	/// 1D gauss function
 	///
 	/// @see gtc_epsilon
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T gauss(
 		T x,
 		T ExpectedValue,
@@ -39,7 +39,7 @@ namespace glm
 	/// 2D gauss function
 	///
 	/// @see gtc_epsilon
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T gauss(
 		vec<2, T, P> const& Coord,
 		vec<2, T, P> const& ExpectedValue,
diff --git a/glm/gtc/functions.inl b/glm/gtc/functions.inl
index 6db646f8..b332e9eb 100644
--- a/glm/gtc/functions.inl
+++ b/glm/gtc/functions.inl
@@ -5,7 +5,7 @@
 
 namespace glm
 {
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T gauss
 	(
 		T x,
@@ -16,7 +16,7 @@ namespace glm
 		return exp(-((x - ExpectedValue) * (x - ExpectedValue)) / (static_cast<T>(2) * StandardDeviation * StandardDeviation)) / (StandardDeviation * sqrt(static_cast<T>(6.28318530717958647692528676655900576)));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T gauss
 	(
 		vec<2, T, P> const& Coord,
diff --git a/glm/gtc/integer.hpp b/glm/gtc/integer.hpp
index ddd5d9ac..894500c5 100644
--- a/glm/gtc/integer.hpp
+++ b/glm/gtc/integer.hpp
@@ -32,7 +32,7 @@ namespace glm
 
 	/// Returns the log2 of x for integer values. Can be reliably using to compute mipmap count from the texture size.
 	/// @see gtc_integer
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL genIUType log2(genIUType x);
 
 	/// Modulus. Returns x % y
@@ -43,7 +43,7 @@ namespace glm
 	/// @see gtc_integer
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL genIUType mod(genIUType x, genIUType y);
 
 	/// Modulus. Returns x % y
@@ -55,8 +55,8 @@ namespace glm
 	/// @see gtc_integer
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> mod(vecType<D, T, P> const & x, T y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> mod(vecType<L, T, P> const & x, T y);
 
 	/// Modulus. Returns x % y
 	/// for each component in x using the floating point value y.
@@ -67,8 +67,8 @@ namespace glm
 	/// @see gtc_integer
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> mod(vecType<D, T, P> const & x, vecType<D, T, P> const & y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> mod(vecType<L, T, P> const & x, vecType<L, T, P> const & y);
 
 	/// Returns a value equal to the nearest integer to x.
 	/// The fraction 0.5 will round in a direction chosen by the
@@ -80,8 +80,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/round.xml">GLSL round man page</a>
 	/// @see gtc_integer
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, int, P> iround(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, int, P> iround(vecType<L, T, P> const & x);
 
 	/// Returns a value equal to the nearest integer to x.
 	/// The fraction 0.5 will round in a direction chosen by the
@@ -93,8 +93,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/round.xml">GLSL round man page</a>
 	/// @see gtc_integer
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, uint, P> uround(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, uint, P> uround(vecType<L, T, P> const & x);
 
 	/// @}
 } //namespace glm
diff --git a/glm/gtc/integer.inl b/glm/gtc/integer.inl
index 0ec2fd41..1dfe9038 100644
--- a/glm/gtc/integer.inl
+++ b/glm/gtc/integer.inl
@@ -4,19 +4,19 @@
 namespace glm{
 namespace detail
 {
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool Aligned>
-	struct compute_log2<D, T, P, vecType, false, Aligned>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool Aligned>
+	struct compute_log2<L, T, P, vecType, false, Aligned>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & vec)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const& v)
 		{
 			//Equivalent to return findMSB(vec); but save one function call in ASM with VC
 			//return findMSB(vec);
-			return vecType<D, T, P>(detail::compute_findMSB_vec<D, T, P, vecType, sizeof(T) * 8>::call(vec));
+			return vecType<L, T, P>(detail::compute_findMSB_vec<L, T, P, vecType, sizeof(T) * 8>::call(v));
 		}
 	};
 
 #	if GLM_HAS_BITSCAN_WINDOWS
-		template <precision P, bool Aligned>
+		template<precision P, bool Aligned>
 		struct compute_log2<4, int, P, vec, false, Aligned>
 		{
 			GLM_FUNC_QUALIFIER static vec<4, int, P> call(vec<4, int, P> const& v)
@@ -33,7 +33,7 @@ namespace detail
 		};
 #	endif//GLM_HAS_BITSCAN_WINDOWS
 }//namespace detail
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER int iround(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'iround' only accept floating-point inputs");
@@ -42,16 +42,16 @@ namespace detail
 		return static_cast<int>(x + static_cast<genType>(0.5));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, int, P> iround(vecType<D, T, P> const& x)
+	template<glm::length_t L, typename T, precision P, template<glm::length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, int, P> iround(vecType<L, T, P> const& x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'iround' only accept floating-point inputs");
-		assert(all(lessThanEqual(vecType<D, T, P>(0), x)));
+		assert(all(lessThanEqual(vecType<L, T, P>(0), x)));
 
-		return vecType<D, int, P>(x + static_cast<T>(0.5));
+		return vecType<L, int, P>(x + static_cast<T>(0.5));
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER uint uround(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'uround' only accept floating-point inputs");
@@ -60,12 +60,12 @@ namespace detail
 		return static_cast<uint>(x + static_cast<genType>(0.5));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, uint, P> uround(vecType<D, T, P> const& x)
+	template<glm::length_t L, typename T, precision P, template<glm::length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, uint, P> uround(vecType<L, T, P> const& x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'uround' only accept floating-point inputs");
-		assert(all(lessThanEqual(vecType<D, T, P>(0), x)));
+		assert(all(lessThanEqual(vecType<L, T, P>(0), x)));
 
-		return vecType<D, uint, P>(x + static_cast<T>(0.5));
+		return vecType<L, uint, P>(x + static_cast<T>(0.5));
 	}
 }//namespace glm
diff --git a/glm/gtc/matrix_access.hpp b/glm/gtc/matrix_access.hpp
index e4156ef4..ae3bd8d1 100644
--- a/glm/gtc/matrix_access.hpp
+++ b/glm/gtc/matrix_access.hpp
@@ -25,14 +25,14 @@ namespace glm
 
 	/// Get a specific row of a matrix.
 	/// @see gtc_matrix_access
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL typename genType::row_type row(
 		genType const & m,
 		length_t index);
 
 	/// Set a specific row to a matrix.
 	/// @see gtc_matrix_access
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType row(
 		genType const & m,
 		length_t index,
@@ -40,14 +40,14 @@ namespace glm
 
 	/// Get a specific column of a matrix.
 	/// @see gtc_matrix_access
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL typename genType::col_type column(
 		genType const & m,
 		length_t index);
 
 	/// Set a specific column to a matrix.
 	/// @see gtc_matrix_access
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType column(
 		genType const & m,
 		length_t index,
diff --git a/glm/gtc/matrix_access.inl b/glm/gtc/matrix_access.inl
index 831b9405..23ba348c 100644
--- a/glm/gtc/matrix_access.inl
+++ b/glm/gtc/matrix_access.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType row
 	(
 		genType const & m,
@@ -19,7 +19,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER typename genType::row_type row
 	(
 		genType const & m,
@@ -34,7 +34,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType column
 	(
 		genType const & m,
@@ -49,7 +49,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER typename genType::col_type column
 	(
 		genType const & m,
diff --git a/glm/gtc/matrix_inverse.hpp b/glm/gtc/matrix_inverse.hpp
index 589381d4..bbc73800 100644
--- a/glm/gtc/matrix_inverse.hpp
+++ b/glm/gtc/matrix_inverse.hpp
@@ -32,7 +32,7 @@ namespace glm
 	/// @param m Input matrix to invert.
 	/// @tparam genType Squared floating-point matrix: half, float or double. Inverse of matrix based of half-precision floating point value is highly innacurate.
 	/// @see gtc_matrix_inverse
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_DECL genType affineInverse(genType const & m);
 
 	/// Compute the inverse transpose of a matrix.
@@ -40,7 +40,7 @@ namespace glm
 	/// @param m Input matrix to invert transpose.
 	/// @tparam genType Squared floating-point matrix: half, float or double. Inverse of matrix based of half-precision floating point value is highly innacurate.
 	/// @see gtc_matrix_inverse
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType inverseTranspose(genType const & m);
 
 	/// @}
diff --git a/glm/gtc/matrix_inverse.inl b/glm/gtc/matrix_inverse.inl
index dd65ecec..b1d9d900 100644
--- a/glm/gtc/matrix_inverse.inl
+++ b/glm/gtc/matrix_inverse.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> affineInverse(mat<3, 3, T, P> const & m)
 	{
 		mat<2, 2, T, P> const Inv(inverse(mat<2, 2, T, P>(m)));
@@ -14,7 +14,7 @@ namespace glm
 			vec<3, T, P>(-Inv * vec<2, T, P>(m[2]), static_cast<T>(1)));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> affineInverse(mat<4, 4, T, P> const & m)
 	{
 		mat<3, 3, T, P> const Inv(inverse(mat<3, 3, T, P>(m)));
@@ -26,7 +26,7 @@ namespace glm
 			vec<4, T, P>(-Inv * vec<3, T, P>(m[3]), static_cast<T>(1)));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> inverseTranspose(mat<2, 2, T, P> const & m)
 	{
 		T Determinant = m[0][0] * m[1][1] - m[1][0] * m[0][1];
@@ -40,7 +40,7 @@ namespace glm
 		return Inverse;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> inverseTranspose(mat<3, 3, T, P> const & m)
 	{
 		T Determinant =
@@ -63,7 +63,7 @@ namespace glm
 		return Inverse;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> inverseTranspose(mat<4, 4, T, P> const & m)
 	{
 		T SubFactor00 = m[2][2] * m[3][3] - m[3][2] * m[2][3];
diff --git a/glm/gtc/matrix_transform.hpp b/glm/gtc/matrix_transform.hpp
index b08ab68a..bbbbcfc2 100644
--- a/glm/gtc/matrix_transform.hpp
+++ b/glm/gtc/matrix_transform.hpp
@@ -54,7 +54,7 @@ namespace glm
 	/// @see gtc_matrix_transform
 	/// @see - translate(mat<4, 4, T, P> const & m, T x, T y, T z)
 	/// @see - translate(vec<3, T, P> const & v)
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> translate(
 		mat<4, 4, T, P> const& m,
 		vec<3, T, P> const & v);
@@ -68,7 +68,7 @@ namespace glm
 	/// @see gtc_matrix_transform
 	/// @see - rotate(mat<4, 4, T, P> const & m, T angle, T x, T y, T z) 
 	/// @see - rotate(T angle, vec<3, T, P> const & v) 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> rotate(
 		mat<4, 4, T, P> const& m,
 		T angle,
@@ -82,7 +82,7 @@ namespace glm
 	/// @see gtc_matrix_transform
 	/// @see - scale(mat<4, 4, T, P> const & m, T x, T y, T z)
 	/// @see - scale(vec<3, T, P> const & v)
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> scale(
 		mat<4, 4, T, P> const& m,
 		vec<3, T, P> const & v);
@@ -98,7 +98,7 @@ namespace glm
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
 	/// @see - glm::ortho(T const & left, T const & right, T const & bottom, T const & top)
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> ortho(
 		T left,
 		T right,
@@ -118,7 +118,7 @@ namespace glm
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
 	/// @see - glm::ortho(T const & left, T const & right, T const & bottom, T const & top)
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> orthoLH(
 		T left,
 		T right,
@@ -138,7 +138,7 @@ namespace glm
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
 	/// @see - glm::ortho(T const & left, T const & right, T const & bottom, T const & top)
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> orthoRH(
 		T left,
 		T right,
@@ -156,7 +156,7 @@ namespace glm
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
 	/// @see - glm::ortho(T const & left, T const & right, T const & bottom, T const & top, T const & zNear, T const & zFar)
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> ortho(
 		T left,
 		T right,
@@ -173,7 +173,7 @@ namespace glm
 	/// @param far
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> frustum(
 		T left,
 		T right,
@@ -192,7 +192,7 @@ namespace glm
 	/// @param far
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> frustumLH(
 		T left,
 		T right,
@@ -211,7 +211,7 @@ namespace glm
 	/// @param far
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> frustumRH(
 		T left,
 		T right,
@@ -228,7 +228,7 @@ namespace glm
 	/// @param far Specifies the distance from the viewer to the far clipping plane (always positive).
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> perspective(
 		T fovy,
 		T aspect,
@@ -243,7 +243,7 @@ namespace glm
 	/// @param far Specifies the distance from the viewer to the far clipping plane (always positive).
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> perspectiveRH(
 		T fovy,
 		T aspect,
@@ -258,7 +258,7 @@ namespace glm
 	/// @param far Specifies the distance from the viewer to the far clipping plane (always positive).
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> perspectiveLH(
 		T fovy,
 		T aspect,
@@ -274,7 +274,7 @@ namespace glm
 	/// @param far Specifies the distance from the viewer to the far clipping plane (always positive).
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> perspectiveFov(
 		T fov,
 		T width,
@@ -291,7 +291,7 @@ namespace glm
 	/// @param far Specifies the distance from the viewer to the far clipping plane (always positive).
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> perspectiveFovRH(
 		T fov,
 		T width,
@@ -308,7 +308,7 @@ namespace glm
 	/// @param far Specifies the distance from the viewer to the far clipping plane (always positive).
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> perspectiveFovLH(
 		T fov,
 		T width,
@@ -323,7 +323,7 @@ namespace glm
 	/// @param near Specifies the distance from the viewer to the near clipping plane (always positive).
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> infinitePerspective(
 		T fovy, T aspect, T near);
 
@@ -334,7 +334,7 @@ namespace glm
 	/// @param near Specifies the distance from the viewer to the near clipping plane (always positive).
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> infinitePerspectiveLH(
 		T fovy, T aspect, T near);
 
@@ -345,7 +345,7 @@ namespace glm
 	/// @param near Specifies the distance from the viewer to the near clipping plane (always positive).
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> infinitePerspectiveRH(
 		T fovy, T aspect, T near);
 
@@ -356,7 +356,7 @@ namespace glm
 	/// @param near Specifies the distance from the viewer to the near clipping plane (always positive).
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> tweakedInfinitePerspective(
 		T fovy, T aspect, T near);
 
@@ -368,7 +368,7 @@ namespace glm
 	/// @param ep 
 	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
 	/// @see gtc_matrix_transform
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> tweakedInfinitePerspective(
 		T fovy, T aspect, T near, T ep);
 
@@ -382,7 +382,7 @@ namespace glm
 	/// @tparam T Native type used for the computation. Currently supported: half (not recommanded), float or double.
 	/// @tparam U Currently supported: Floating-point types and integer types.
 	/// @see gtc_matrix_transform
-	template <typename T, typename U, precision P>
+	template<typename T, typename U, precision P>
 	GLM_FUNC_DECL vec<3, T, P> project(
 		vec<3, T, P> const & obj,
 		mat<4, 4, T, P> const& model,
@@ -399,7 +399,7 @@ namespace glm
 	/// @tparam T Native type used for the computation. Currently supported: half (not recommanded), float or double.
 	/// @tparam U Currently supported: Floating-point types and integer types.
 	/// @see gtc_matrix_transform
-	template <typename T, typename U, precision P>
+	template<typename T, typename U, precision P>
 	GLM_FUNC_DECL vec<3, T, P> unProject(
 		vec<3, T, P> const & win,
 		mat<4, 4, T, P> const& model,
@@ -414,7 +414,7 @@ namespace glm
 	/// @tparam T Native type used for the computation. Currently supported: half (not recommanded), float or double.
 	/// @tparam U Currently supported: Floating-point types and integer types.
 	/// @see gtc_matrix_transform
-	template <typename T, precision P, typename U>
+	template<typename T, precision P, typename U>
 	GLM_FUNC_DECL mat<4, 4, T, P> pickMatrix(
 		vec<2, T, P> const & center,
 		vec<2, T, P> const & delta,
@@ -427,7 +427,7 @@ namespace glm
 	/// @param up Normalized up vector, how the camera is oriented. Typically (0, 0, 1)
 	/// @see gtc_matrix_transform
 	/// @see - frustum(T const & left, T const & right, T const & bottom, T const & top, T const & nearVal, T const & farVal) frustum(T const & left, T const & right, T const & bottom, T const & top, T const & nearVal, T const & farVal)
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> lookAt(
 		vec<3, T, P> const & eye,
 		vec<3, T, P> const & center,
@@ -440,7 +440,7 @@ namespace glm
 	/// @param up Normalized up vector, how the camera is oriented. Typically (0, 0, 1)
 	/// @see gtc_matrix_transform
 	/// @see - frustum(T const & left, T const & right, T const & bottom, T const & top, T const & nearVal, T const & farVal) frustum(T const & left, T const & right, T const & bottom, T const & top, T const & nearVal, T const & farVal)
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> lookAtRH(
 		vec<3, T, P> const & eye,
 		vec<3, T, P> const & center,
@@ -453,7 +453,7 @@ namespace glm
 	/// @param up Normalized up vector, how the camera is oriented. Typically (0, 0, 1)
 	/// @see gtc_matrix_transform
 	/// @see - frustum(T const & left, T const & right, T const & bottom, T const & top, T const & nearVal, T const & farVal) frustum(T const & left, T const & right, T const & bottom, T const & top, T const & nearVal, T const & farVal)
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> lookAtLH(
 		vec<3, T, P> const & eye,
 		vec<3, T, P> const & center,
diff --git a/glm/gtc/matrix_transform.inl b/glm/gtc/matrix_transform.inl
index c9257995..bf8aed6c 100644
--- a/glm/gtc/matrix_transform.inl
+++ b/glm/gtc/matrix_transform.inl
@@ -7,7 +7,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> translate(mat<4, 4, T, P> const & m, vec<3, T, P> const & v)
 	{
 		mat<4, 4, T, P> Result(m);
@@ -15,7 +15,7 @@ namespace glm
 		return Result;
 	}
 	
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> rotate(mat<4, 4, T, P> const & m, T angle, vec<3, T, P> const & v)
 	{
 		T const a = angle;
@@ -46,7 +46,7 @@ namespace glm
 		return Result;
 	}
 		
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> rotate_slow(mat<4, 4, T, P> const & m, T angle, vec<3, T, P> const & v)
 	{
 		T const a = angle;
@@ -75,7 +75,7 @@ namespace glm
 		return m * Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> scale(mat<4, 4, T, P> const & m, vec<3, T, P> const & v)
 	{
 		mat<4, 4, T, P> Result(uninitialize);
@@ -86,7 +86,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> scale_slow(mat<4, 4, T, P> const & m, vec<3, T, P> const & v)
 	{
 		mat<4, 4, T, P> Result(T(1));
@@ -96,7 +96,7 @@ namespace glm
 		return m * Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> ortho
 	(
 		T left, T right,
@@ -111,7 +111,7 @@ namespace glm
 #		endif
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> orthoLH
 	(
 		T left, T right,
@@ -136,7 +136,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> orthoRH
 	(
 		T left, T right,
@@ -161,7 +161,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> ortho
 	(
 		T left, T right,
@@ -177,7 +177,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> frustum
 	(
 		T left, T right,
@@ -192,7 +192,7 @@ namespace glm
 #		endif
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> frustumLH
 	(
 		T left, T right,
@@ -218,7 +218,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> frustumRH
 	(
 		T left, T right,
@@ -244,7 +244,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> perspective(T fovy, T aspect, T zNear, T zFar)
 	{
 #		if GLM_COORDINATE_SYSTEM == GLM_LEFT_HANDED
@@ -254,7 +254,7 @@ namespace glm
 #		endif
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> perspectiveRH(T fovy, T aspect, T zNear, T zFar)
 	{
 		assert(abs(aspect - std::numeric_limits<T>::epsilon()) > static_cast<T>(0));
@@ -277,7 +277,7 @@ namespace glm
 		return Result;
 	}
 	
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> perspectiveLH(T fovy, T aspect, T zNear, T zFar)
 	{
 		assert(abs(aspect - std::numeric_limits<T>::epsilon()) > static_cast<T>(0));
@@ -300,7 +300,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> perspectiveFov(T fov, T width, T height, T zNear, T zFar)
 	{
 #		if GLM_COORDINATE_SYSTEM == GLM_LEFT_HANDED
@@ -310,7 +310,7 @@ namespace glm
 #		endif
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> perspectiveFovRH(T fov, T width, T height, T zNear, T zFar)
 	{
 		assert(width > static_cast<T>(0));
@@ -337,7 +337,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> perspectiveFovLH(T fov, T width, T height, T zNear, T zFar)
 	{
 		assert(width > static_cast<T>(0));
@@ -364,7 +364,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> infinitePerspective(T fovy, T aspect, T zNear)
 	{
 #		if GLM_COORDINATE_SYSTEM == GLM_LEFT_HANDED
@@ -374,7 +374,7 @@ namespace glm
 #		endif
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> infinitePerspectiveRH(T fovy, T aspect, T zNear)
 	{
 		T const range = tan(fovy / static_cast<T>(2)) * zNear;
@@ -392,7 +392,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> infinitePerspectiveLH(T fovy, T aspect, T zNear)
 	{
 		T const range = tan(fovy / static_cast<T>(2)) * zNear;
@@ -411,7 +411,7 @@ namespace glm
 	}
 
 	// Infinite projection matrix: http://www.terathon.com/gdc07_lengyel.pdf
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> tweakedInfinitePerspective(T fovy, T aspect, T zNear, T ep)
 	{
 		T const range = tan(fovy / static_cast<T>(2)) * zNear;	
@@ -429,13 +429,13 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> tweakedInfinitePerspective(T fovy, T aspect, T zNear)
 	{
 		return tweakedInfinitePerspective(fovy, aspect, zNear, epsilon<T>());
 	}
 
-	template <typename T, typename U, precision P>
+	template<typename T, typename U, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> project
 	(
 		vec<3, T, P> const & obj,
@@ -461,7 +461,7 @@ namespace glm
 		return vec<3, T, P>(tmp);
 	}
 
-	template <typename T, typename U, precision P>
+	template<typename T, typename U, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> unProject
 	(
 		vec<3, T, P> const & win,
@@ -488,7 +488,7 @@ namespace glm
 		return vec<3, T, P>(obj);
 	}
 
-	template <typename T, precision P, typename U>
+	template<typename T, precision P, typename U>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> pickMatrix(vec<2, T, P> const & center, vec<2, T, P> const & delta, vec<4, U, P> const & viewport)
 	{
 		assert(delta.x > static_cast<T>(0) && delta.y > static_cast<T>(0));
@@ -507,7 +507,7 @@ namespace glm
 		return scale(Result, vec<3, T, P>(static_cast<T>(viewport[2]) / delta.x, static_cast<T>(viewport[3]) / delta.y, static_cast<T>(1)));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> lookAt(vec<3, T, P> const & eye, vec<3, T, P> const & center, vec<3, T, P> const & up)
 	{
 #		if GLM_COORDINATE_SYSTEM == GLM_LEFT_HANDED
@@ -517,7 +517,7 @@ namespace glm
 #		endif
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> lookAtRH
 	(
 		vec<3, T, P> const & eye,
@@ -545,7 +545,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> lookAtLH
 	(
 		vec<3, T, P> const & eye,
diff --git a/glm/gtc/noise.hpp b/glm/gtc/noise.hpp
index d913d944..870c5fbc 100644
--- a/glm/gtc/noise.hpp
+++ b/glm/gtc/noise.hpp
@@ -37,22 +37,22 @@ namespace glm
 
 	/// Classic perlin noise.
 	/// @see gtc_noise
-	template <int D, typename T, precision P, template<int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_DECL T perlin(
-		vecType<D, T, P> const & p);
+		vecType<L, T, P> const& p);
 		
 	/// Periodic perlin noise.
 	/// @see gtc_noise
-	template <int D, typename T, precision P, template<int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_DECL T perlin(
-		vecType<D, T, P> const & p,
-		vecType<D, T, P> const & rep);
+		vecType<L, T, P> const& p,
+		vecType<L, T, P> const& rep);
 
 	/// Simplex noise.
 	/// @see gtc_noise
-	template <int D, typename T, precision P, template<int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_DECL T simplex(
-		vecType<D, T, P> const & p);
+		vecType<L, T, P> const& p);
 
 	/// @}
 }//namespace glm
diff --git a/glm/gtc/noise.inl b/glm/gtc/noise.inl
index 5ab15472..d3a676f2 100644
--- a/glm/gtc/noise.inl
+++ b/glm/gtc/noise.inl
@@ -9,7 +9,7 @@
 namespace glm{
 namespace gtc
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> grad4(T const & j, vec<4, T, P> const & ip)
 	{
 		vec<3, T, P> pXYZ = floor(fract(vec<3, T, P>(j) * vec<3, T, P>(ip)) * T(7)) * ip[2] - T(1);
@@ -21,7 +21,7 @@ namespace gtc
 }//namespace gtc
 
 	// Classic Perlin noise
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T perlin(vec<2, T, P> const & Position)
 	{
 		vec<4, T, P> Pi = glm::floor(vec<4, T, P>(Position.x, Position.y, Position.x, Position.y)) + vec<4, T, P>(0.0, 0.0, 1.0, 1.0);
@@ -62,7 +62,7 @@ namespace gtc
 	}
 
 	// Classic Perlin noise
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T perlin(vec<3, T, P> const & Position)
 	{
 		vec<3, T, P> Pi0 = floor(Position); // Integer part for indexing
@@ -133,7 +133,7 @@ namespace gtc
 	}
 	/*
 	// Classic Perlin noise
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T perlin(vec<3, T, P> const & P)
 	{
 		vec<3, T, P> Pi0 = floor(P); // Integer part for indexing
@@ -206,7 +206,7 @@ namespace gtc
 	}
 	*/
 	// Classic Perlin noise
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T perlin(vec<4, T, P> const & Position)
 	{
 		vec<4, T, P> Pi0 = floor(Position);	// Integer part for indexing
@@ -342,7 +342,7 @@ namespace gtc
 	}
 
 	// Classic Perlin noise, periodic variant
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T perlin(vec<2, T, P> const & Position, vec<2, T, P> const & rep)
 	{
 		vec<4, T, P> Pi = floor(vec<4, T, P>(Position.x, Position.y, Position.x, Position.y)) + vec<4, T, P>(0.0, 0.0, 1.0, 1.0);
@@ -384,7 +384,7 @@ namespace gtc
 	}
 
 	// Classic Perlin noise, periodic variant
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T perlin(vec<3, T, P> const & Position, vec<3, T, P> const & rep)
 	{
 		vec<3, T, P> Pi0 = mod(floor(Position), rep); // Integer part, modulo period
@@ -455,7 +455,7 @@ namespace gtc
 	}
 
 	// Classic Perlin noise, periodic version
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T perlin(vec<4, T, P> const & Position, vec<4, T, P> const & rep)
 	{
 		vec<4, T, P> Pi0 = mod(floor(Position), rep); // Integer part modulo rep
@@ -588,7 +588,7 @@ namespace gtc
 		return T(2.2) * n_xyzw;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T simplex(glm::vec<2, T, P> const & v)
 	{
 		vec<4, T, P> const C = vec<4, T, P>(
@@ -645,7 +645,7 @@ namespace gtc
 		return T(130) * dot(m, g);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T simplex(vec<3, T, P> const & v)
 	{
 		vec<2, T, P> const C(1.0 / 6.0, 1.0 / 3.0);
@@ -720,7 +720,7 @@ namespace gtc
 		return T(42) * dot(m * m, vec<4, T, P>(dot(p0, x0), dot(p1, x1), dot(p2, x2), dot(p3, x3)));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T simplex(vec<4, T, P> const & v)
 	{
 		vec<4, T, P> const C(
diff --git a/glm/gtc/packing.hpp b/glm/gtc/packing.hpp
index ac656640..3240c71a 100644
--- a/glm/gtc/packing.hpp
+++ b/glm/gtc/packing.hpp
@@ -477,7 +477,7 @@ namespace glm
 	/// @see gtc_packing
 	/// @see vec<3, T, P> unpackRGBM(vec<4, T, P> const & p)
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
-	template <int D, typename T, precision P>
+	template<length_t L, typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> packRGBM(vec<3, T, P> const & rgb);
 
 	/// Returns a floating-point vector with components obtained by reinterpreting an integer vector as 16-bit floating-point numbers and converting them to 32-bit floating-point values.
@@ -487,7 +487,7 @@ namespace glm
 	/// @see gtc_packing
 	/// @see vec<4, T, P> packRGBM(vec<3, float, P> const & v)
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
-	template <int D, typename T, precision P>
+	template<length_t L, typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> unpackRGBM(vec<4, T, P> const & rgbm);
 
 	/// Returns an unsigned integer vector obtained by converting the components of a floating-point vector
@@ -496,48 +496,48 @@ namespace glm
 	/// the forth component specifies the 16 most-significant bits.
 	/// 
 	/// @see gtc_packing
-	/// @see vecType<D, float, P> unpackHalf(vecType<D, uint16, P> const & p)
+	/// @see vecType<L, float, P> unpackHalf(vecType<L, uint16, P> const & p)
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, uint16, P> packHalf(vecType<D, float, P> const & v);
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, uint16, P> packHalf(vecType<L, float, P> const & v);
 
 	/// Returns a floating-point vector with components obtained by reinterpreting an integer vector as 16-bit floating-point numbers and converting them to 32-bit floating-point values.
 	/// The first component of the vector is obtained from the 16 least-significant bits of v;
 	/// the forth component is obtained from the 16 most-significant bits of v.
 	/// 
 	/// @see gtc_packing
-	/// @see vecType<D, uint16, P> packHalf(vecType<D, float, P> const & v)
+	/// @see vecType<L, uint16, P> packHalf(vecType<L, float, P> const & v)
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions</a>
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, float, P> unpackHalf(vecType<D, uint16, P> const & p);
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, float, P> unpackHalf(vecType<L, uint16, P> const & p);
 
 	/// Convert each component of the normalized floating-point vector into unsigned integer values.
 	///
 	/// @see gtc_packing
-	/// @see vecType<D, floatType, P> unpackUnorm(vecType<D, intType, P> const & p);
-	template <int D, typename uintType, typename floatType, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, uintType, P> packUnorm(vecType<D, floatType, P> const & v);
+	/// @see vecType<L, floatType, P> unpackUnorm(vecType<L, intType, P> const & p);
+	template<length_t L, typename uintType, typename floatType, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, uintType, P> packUnorm(vecType<L, floatType, P> const & v);
 
 	/// Convert each unsigned integer components of a vector to normalized floating-point values.
 	/// 
 	/// @see gtc_packing
-	/// @see vecType<D, intType, P> packUnorm(vecType<D, floatType, P> const & v)
-	template <int D, typename uintType, typename floatType, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, floatType, P> unpackUnorm(vecType<D, uintType, P> const & v);
+	/// @see vecType<L, intType, P> packUnorm(vecType<L, floatType, P> const & v)
+	template<length_t L, typename uintType, typename floatType, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, floatType, P> unpackUnorm(vecType<L, uintType, P> const & v);
 
 	/// Convert each component of the normalized floating-point vector into signed integer values.
 	///
 	/// @see gtc_packing
-	/// @see vecType<D, floatType, P> unpackSnorm(vecType<D, intType, P> const & p);
-	template <int D, typename intType, typename floatType, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, intType, P> packSnorm(vecType<D, floatType, P> const & v);
+	/// @see vecType<L, floatType, P> unpackSnorm(vecType<L, intType, P> const & p);
+	template<length_t L, typename intType, typename floatType, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, intType, P> packSnorm(vecType<L, floatType, P> const & v);
 
 	/// Convert each signed integer components of a vector to normalized floating-point values.
 	/// 
 	/// @see gtc_packing
-	/// @see vecType<D, intType, P> packSnorm(vecType<D, floatType, P> const & v)
-	template <int D, typename intType, typename floatType, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, floatType, P> unpackSnorm(vecType<D, intType, P> const & v);
+	/// @see vecType<L, intType, P> packSnorm(vecType<L, floatType, P> const & v)
+	template<length_t L, typename intType, typename floatType, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, floatType, P> unpackSnorm(vecType<L, intType, P> const & v);
 
 	/// Convert each component of the normalized floating-point vector into unsigned integer values.
 	///
diff --git a/glm/gtc/packing.inl b/glm/gtc/packing.inl
index 28d1dcbd..fb3766f9 100644
--- a/glm/gtc/packing.inl
+++ b/glm/gtc/packing.inl
@@ -270,11 +270,11 @@ namespace detail
 		uint32 pack;
 	};
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
 	struct compute_half
 	{};
 
-	template <precision P>
+	template<precision P>
 	struct compute_half<1, P, vec>
 	{
 		GLM_FUNC_QUALIFIER static vec<1, uint16, P> pack(vec<1, float, P> const & v)
@@ -293,7 +293,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_half<2, P, vec>
 	{
 		GLM_FUNC_QUALIFIER static vec<2, uint16, P> pack(vec<2, float, P> const & v)
@@ -312,7 +312,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_half<3, P, vec>
 	{
 		GLM_FUNC_QUALIFIER static vec<3, uint16, P> pack(vec<3, float, P> const & v)
@@ -331,7 +331,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_half<4, P, vec>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, uint16, P> pack(vec<4, float, P> const & v)
@@ -640,7 +640,7 @@ namespace detail
 	}
 
 	// Based on Brian Karis http://graphicrants.blogspot.fr/2009/04/rgbm-color-encoding.html
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> packRGBM(vec<3, T, P> const & rgb)
 	{
 		vec<3, T, P> const Color(rgb * static_cast<T>(1.0 / 6.0));
@@ -649,58 +649,58 @@ namespace detail
 		return vec<4, T, P>(Color / Alpha, Alpha);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> unpackRGBM(vec<4, T, P> const & rgbm)
 	{
 		return vec<3, T, P>(rgbm.x, rgbm.y, rgbm.z) * rgbm.w * static_cast<T>(6);
 	}
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, uint16, P> packHalf(vecType<D, float, P> const & v)
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, uint16, P> packHalf(vecType<L, float, P> const & v)
 	{
-		return detail::compute_half<D, P, vecType>::pack(v);
+		return detail::compute_half<L, P, vecType>::pack(v);
 	}
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, float, P> unpackHalf(vecType<D, uint16, P> const & v)
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, float, P> unpackHalf(vecType<L, uint16, P> const & v)
 	{
-		return detail::compute_half<D, P, vecType>::unpack(v);
+		return detail::compute_half<L, P, vecType>::unpack(v);
 	}
 
-	template <int D, typename uintType, typename floatType, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, uintType, P> packUnorm(vecType<D, floatType, P> const & v)
+	template<length_t L, typename uintType, typename floatType, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, uintType, P> packUnorm(vecType<L, floatType, P> const & v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<uintType>::is_integer, "uintType must be an integer type");
 		GLM_STATIC_ASSERT(std::numeric_limits<floatType>::is_iec559, "floatType must be a floating point type");
 
-		return vecType<D, uintType, P>(round(clamp(v, static_cast<floatType>(0), static_cast<floatType>(1)) * static_cast<floatType>(std::numeric_limits<uintType>::max())));
+		return vecType<L, uintType, P>(round(clamp(v, static_cast<floatType>(0), static_cast<floatType>(1)) * static_cast<floatType>(std::numeric_limits<uintType>::max())));
 	}
 
-	template <int D, typename uintType, typename floatType, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, floatType, P> unpackUnorm(vecType<D, uintType, P> const & v)
+	template<length_t L, typename uintType, typename floatType, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, floatType, P> unpackUnorm(vecType<L, uintType, P> const & v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<uintType>::is_integer, "uintType must be an integer type");
 		GLM_STATIC_ASSERT(std::numeric_limits<floatType>::is_iec559, "floatType must be a floating point type");
 
-		return vecType<D, float, P>(v) * (static_cast<floatType>(1) / static_cast<floatType>(std::numeric_limits<uintType>::max()));
+		return vecType<L, float, P>(v) * (static_cast<floatType>(1) / static_cast<floatType>(std::numeric_limits<uintType>::max()));
 	}
 
-	template <int D, typename intType, typename floatType, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, intType, P> packSnorm(vecType<D, floatType, P> const & v)
+	template<length_t L, typename intType, typename floatType, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, intType, P> packSnorm(vecType<L, floatType, P> const & v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<intType>::is_integer, "uintType must be an integer type");
 		GLM_STATIC_ASSERT(std::numeric_limits<floatType>::is_iec559, "floatType must be a floating point type");
 
-		return vecType<D, intType, P>(round(clamp(v , static_cast<floatType>(-1), static_cast<floatType>(1)) * static_cast<floatType>(std::numeric_limits<intType>::max())));
+		return vecType<L, intType, P>(round(clamp(v , static_cast<floatType>(-1), static_cast<floatType>(1)) * static_cast<floatType>(std::numeric_limits<intType>::max())));
 	}
 
-	template <int D, typename intType, typename floatType, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, floatType, P> unpackSnorm(vecType<D, intType, P> const & v)
+	template<length_t L, typename intType, typename floatType, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, floatType, P> unpackSnorm(vecType<L, intType, P> const & v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<intType>::is_integer, "uintType must be an integer type");
 		GLM_STATIC_ASSERT(std::numeric_limits<floatType>::is_iec559, "floatType must be a floating point type");
 
-		return clamp(vecType<D, floatType, P>(v) * (static_cast<floatType>(1) / static_cast<floatType>(std::numeric_limits<intType>::max())), static_cast<floatType>(-1), static_cast<floatType>(1));
+		return clamp(vecType<L, floatType, P>(v) * (static_cast<floatType>(1) / static_cast<floatType>(std::numeric_limits<intType>::max())), static_cast<floatType>(-1), static_cast<floatType>(1));
 	}
 
 	GLM_FUNC_QUALIFIER uint8 packUnorm2x4(vec2 const & v)
diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp
index f4faabb7..2486d4db 100644
--- a/glm/gtc/quaternion.hpp
+++ b/glm/gtc/quaternion.hpp
@@ -29,7 +29,7 @@ namespace glm
 	/// @addtogroup gtc_quaternion
 	/// @{
 
-	template <typename T, precision P = defaultp>
+	template<typename T, precision P = defaultp>
 	struct tquat
 	{
 		// -- Implementation detail --
@@ -79,7 +79,7 @@ namespace glm
 
 		GLM_FUNC_DECL GLM_CONSTEXPR tquat() GLM_DEFAULT_CTOR;
 		GLM_FUNC_DECL GLM_CONSTEXPR tquat(tquat<T, P> const & q) GLM_DEFAULT;
-		template <precision Q>
+		template<precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR tquat(tquat<T, Q> const & q);
 
 		// -- Explicit basic constructors --
@@ -90,7 +90,7 @@ namespace glm
 
 		// -- Conversion constructors --
 
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tquat(tquat<U, Q> const & q);
 
 		/// Explicit conversion operators
@@ -116,81 +116,81 @@ namespace glm
 
 		GLM_FUNC_DECL tquat<T, P> & operator=(tquat<T, P> const & m) GLM_DEFAULT;
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL tquat<T, P> & operator=(tquat<U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL tquat<T, P> & operator+=(tquat<U, P> const & q);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL tquat<T, P> & operator-=(tquat<U, P> const & q);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL tquat<T, P> & operator*=(tquat<U, P> const & q);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL tquat<T, P> & operator*=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL tquat<T, P> & operator/=(U s);
 	};
 
 	// -- Unary bit operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> operator+(tquat<T, P> const & q);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> operator-(tquat<T, P> const & q);
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> operator+(tquat<T, P> const & q, tquat<T, P> const & p);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> operator*(tquat<T, P> const & q, tquat<T, P> const & p);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator*(tquat<T, P> const & q, vec<3, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator*(vec<3, T, P> const & v, tquat<T, P> const & q);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator*(tquat<T, P> const & q, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator*(vec<4, T, P> const & v, tquat<T, P> const & q);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> operator*(tquat<T, P> const & q, T const & s);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> operator*(T const & s, tquat<T, P> const & q);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> operator/(tquat<T, P> const & q, T const & s);
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator==(tquat<T, P> const & q1, tquat<T, P> const & q2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator!=(tquat<T, P> const & q1, tquat<T, P> const & q2);
 
 	/// Returns the length of the quaternion.
 	/// 
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T length(tquat<T, P> const & q);
 
 	/// Returns the normalized quaternion.
 	/// 
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> normalize(tquat<T, P> const & q);
 		
 	/// Returns dot product of q1 and q2, i.e., q1[0] * q2[0] + q1[1] * q2[1] + ...
 	/// 
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T dot(tquat<T, P> const & x, tquat<T, P> const & y);
 
 	/// Spherical linear interpolation of two quaternions.
@@ -203,7 +203,7 @@ namespace glm
 	/// @tparam T Value type used to build the quaternion. Supported: half, float or double.
 	/// @see gtc_quaternion
 	/// @see - slerp(tquat<T, P> const & x, tquat<T, P> const & y, T const & a)
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> mix(tquat<T, P> const & x, tquat<T, P> const & y, T a);
 
 	/// Linear interpolation of two quaternions.
@@ -214,7 +214,7 @@ namespace glm
 	/// @param a Interpolation factor. The interpolation is defined in the range [0, 1].
 	/// @tparam T Value type used to build the quaternion. Supported: half, float or double.
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> lerp(tquat<T, P> const & x, tquat<T, P> const & y, T a);
 
 	/// Spherical linear interpolation of two quaternions.
@@ -225,19 +225,19 @@ namespace glm
 	/// @param a Interpolation factor. The interpolation is defined beyond the range [0, 1].
 	/// @tparam T Value type used to build the quaternion. Supported: half, float or double.
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> slerp(tquat<T, P> const & x, tquat<T, P> const & y, T a);
 
 	/// Returns the q conjugate.
 	/// 
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> conjugate(tquat<T, P> const & q);
 
 	/// Returns the q inverse.
 	/// 
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> inverse(tquat<T, P> const & q);
 
 	/// Rotates a quaternion from a vector of 3 components axis and an angle.
@@ -247,68 +247,68 @@ namespace glm
 	/// @param axis Axis of the rotation
 	/// 
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> rotate(tquat<T, P> const & q, T const & angle, vec<3, T, P> const & axis);
 
 	/// Returns euler angles, pitch as x, yaw as y, roll as z.
 	/// The result is expressed in radians if GLM_FORCE_RADIANS is defined or degrees otherwise.
 	/// 
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> eulerAngles(tquat<T, P> const & x);
 
 	/// Returns roll value of euler angles expressed in radians.
 	///
 	/// @see gtx_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T roll(tquat<T, P> const & x);
 
 	/// Returns pitch value of euler angles expressed in radians.
 	///
 	/// @see gtx_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T pitch(tquat<T, P> const & x);
 
 	/// Returns yaw value of euler angles expressed in radians.
 	///
 	/// @see gtx_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T yaw(tquat<T, P> const & x);
 
 	/// Converts a quaternion to a 3 * 3 matrix.
 	/// 
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> mat3_cast(tquat<T, P> const & x);
 
 	/// Converts a quaternion to a 4 * 4 matrix.
 	/// 
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> mat4_cast(tquat<T, P> const & x);
 
 	/// Converts a 3 * 3 matrix to a quaternion.
 	/// 
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> quat_cast(mat<3, 3, T, P> const & x);
 
 	/// Converts a 4 * 4 matrix to a quaternion.
 	/// 
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> quat_cast(mat<4, 4, T, P> const & x);
 
 	/// Returns the quaternion rotation angle.
 	///
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T angle(tquat<T, P> const & x);
 
 	/// Returns the q rotation axis.
 	///
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> axis(tquat<T, P> const & x);
 
 	/// Build a quaternion from an angle and a normalized axis.
@@ -317,7 +317,7 @@ namespace glm
 	/// @param axis Axis of the quaternion, must be normalized.
 	///
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> angleAxis(T const & angle, vec<3, T, P> const & axis);
 
 	/// Returns the component-wise comparison result of x < y.
@@ -325,7 +325,7 @@ namespace glm
 	/// @tparam quatType Floating-point quaternion types.
 	///
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, bool, P> lessThan(tquat<T, P> const & x, tquat<T, P> const & y);
 
 	/// Returns the component-wise comparison of result x <= y.
@@ -333,7 +333,7 @@ namespace glm
 	/// @tparam quatType Floating-point quaternion types.
 	///
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, bool, P> lessThanEqual(tquat<T, P> const & x, tquat<T, P> const & y);
 
 	/// Returns the component-wise comparison of result x > y.
@@ -341,7 +341,7 @@ namespace glm
 	/// @tparam quatType Floating-point quaternion types.
 	///
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, bool, P> greaterThan(tquat<T, P> const & x, tquat<T, P> const & y);
 
 	/// Returns the component-wise comparison of result x >= y.
@@ -349,7 +349,7 @@ namespace glm
 	/// @tparam quatType Floating-point quaternion types.
 	///
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, bool, P> greaterThanEqual(tquat<T, P> const & x, tquat<T, P> const & y);
 
 	/// Returns the component-wise comparison of result x == y.
@@ -357,7 +357,7 @@ namespace glm
 	/// @tparam quatType Floating-point quaternion types.
 	///
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, bool, P> equal(tquat<T, P> const & x, tquat<T, P> const & y);
 
 	/// Returns the component-wise comparison of result x != y.
@@ -365,7 +365,7 @@ namespace glm
 	/// @tparam quatType Floating-point quaternion types.
 	///
 	/// @see gtc_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, bool, P> notEqual(tquat<T, P> const & x, tquat<T, P> const & y);
 
 	/// Returns true if x holds a NaN (not a number)
@@ -377,7 +377,7 @@ namespace glm
 	/// /!\ When using compiler fast math, this function may fail.
 	/// 
 	/// @tparam genType Floating-point scalar or vector types.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, bool, P> isnan(tquat<T, P> const & x);
 
 	/// Returns true if x holds a positive infinity or negative
@@ -387,7 +387,7 @@ namespace glm
 	/// representations.
 	/// 
 	/// @tparam genType Floating-point scalar or vector types.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, bool, P> isinf(tquat<T, P> const & x);
 
 	/// @}
diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl
index 91864e53..cb76abb7 100644
--- a/glm/gtc/quaternion.inl
+++ b/glm/gtc/quaternion.inl
@@ -9,7 +9,7 @@
 namespace glm{
 namespace detail
 {
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_dot<tquat<T, P>, T, Aligned>
 	{
 		static GLM_FUNC_QUALIFIER T call(tquat<T, P> const& a, tquat<T, P> const& b)
@@ -19,7 +19,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_quat_add
 	{
 		static tquat<T, P> call(tquat<T, P> const& q, tquat<T, P> const& p)
@@ -28,7 +28,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_quat_sub
 	{
 		static tquat<T, P> call(tquat<T, P> const& q, tquat<T, P> const& p)
@@ -37,7 +37,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_quat_mul_scalar
 	{
 		static tquat<T, P> call(tquat<T, P> const& q, T s)
@@ -46,7 +46,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_quat_div_scalar
 	{
 		static tquat<T, P> call(tquat<T, P> const& q, T s)
@@ -55,7 +55,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P, bool Aligned>
+	template<typename T, precision P, bool Aligned>
 	struct compute_quat_mul_vec4
 	{
 		static vec<4, T, P> call(tquat<T, P> const & q, vec<4, T, P> const & v)
@@ -67,14 +67,14 @@ namespace detail
 
 	// -- Component accesses --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T & tquat<T, P>::operator[](typename tquat<T, P>::length_type i)
 	{
 		assert(i >= 0 && i < this->length());
 		return (&x)[i];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T const & tquat<T, P>::operator[](typename tquat<T, P>::length_type i) const
 	{
 		assert(i >= 0 && i < this->length());
@@ -84,7 +84,7 @@ namespace detail
 	// -- Implicit basic constructors --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat<T, P>::tquat()
 #			ifndef GLM_FORCE_NO_CTOR_INIT
 				: x(0), y(0), z(0), w(1)
@@ -93,38 +93,38 @@ namespace detail
 #	endif
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat<T, P>::tquat(tquat<T, P> const & q)
 			: x(q.x), y(q.y), z(q.z), w(q.w)
 		{}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <precision Q>
+	template<typename T, precision P>
+	template<precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat<T, P>::tquat(tquat<T, Q> const & q)
 		: x(q.x), y(q.y), z(q.z), w(q.w)
 	{}
 
 	// -- Explicit basic constructors --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tquat<T, P>::tquat(ctor)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat<T, P>::tquat(T const & s, vec<3, T, P> const & v)
 		: x(v.x), y(v.y), z(v.z), w(s)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat<T, P>::tquat(T const & w, T const & x, T const & y, T const & z)
 		: x(x), y(y), z(z), w(w)
 	{}
 
 	// -- Conversion constructors --
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat<T, P>::tquat(tquat<U, Q> const & q)
 		: x(static_cast<T>(q.x))
 		, y(static_cast<T>(q.y))
@@ -132,7 +132,7 @@ namespace detail
 		, w(static_cast<T>(q.w))
 	{}
 
-	//template <typename valType> 
+	//template<typename valType> 
 	//GLM_FUNC_QUALIFIER tquat<valType>::tquat
 	//(
 	//	valType const & pitch,
@@ -150,7 +150,7 @@ namespace detail
 	//	this->z = c.x * c.y * s.z - s.x * s.y * c.z;
 	//}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P>::tquat(vec<3, T, P> const & u, vec<3, T, P> const & v)
 	{
 		vec<3, T, P> const LocalW(cross(u, v));
@@ -160,7 +160,7 @@ namespace detail
 		*this = normalize(q);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P>::tquat(vec<3, T, P> const & eulerAngle)
 	{
 		vec<3, T, P> c = glm::cos(eulerAngle * T(0.5));
@@ -172,39 +172,39 @@ namespace detail
 		this->z = c.x * c.y * s.z - s.x * s.y * c.z;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P>::tquat(mat<3, 3, T, P> const & m)
 	{
 		*this = quat_cast(m);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P>::tquat(mat<4, 4, T, P> const & m)
 	{
 		*this = quat_cast(m);
 	}
 
 #	if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P>::operator mat<3, 3, T, P>()
 	{
 		return mat3_cast(*this);
 	}
 	
-	template <typename T, precision P>	
+	template<typename T, precision P>	
 	GLM_FUNC_QUALIFIER tquat<T, P>::operator mat<4, 4, T, P>()
 	{
 		return mat4_cast(*this);
 	}
 #	endif//GLM_HAS_EXPLICIT_CONVERSION_OPERATORS
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> conjugate(tquat<T, P> const & q)
 	{
 		return tquat<T, P>(q.w, -q.x, -q.y, -q.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> inverse(tquat<T, P> const & q)
 	{
 		return conjugate(q) / dot(q, q);
@@ -213,7 +213,7 @@ namespace detail
 	// -- Unary arithmetic operators --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER tquat<T, P> & tquat<T, P>::operator=(tquat<T, P> const & q)
 		{
 			this->w = q.w;
@@ -224,8 +224,8 @@ namespace detail
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER tquat<T, P> & tquat<T, P>::operator=(tquat<U, P> const & q)
 	{
 		this->w = static_cast<T>(q.w);
@@ -235,22 +235,22 @@ namespace detail
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER tquat<T, P> & tquat<T, P>::operator+=(tquat<U, P> const& q)
 	{
 		return (*this = detail::compute_quat_add<T, P, detail::is_aligned<P>::value>::call(*this, tquat<T, P>(q)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER tquat<T, P> & tquat<T, P>::operator-=(tquat<U, P> const& q)
 	{
 		return (*this = detail::compute_quat_sub<T, P, detail::is_aligned<P>::value>::call(*this, tquat<T, P>(q)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER tquat<T, P> & tquat<T, P>::operator*=(tquat<U, P> const & r)
 	{
 		tquat<T, P> const p(*this);
@@ -263,15 +263,15 @@ namespace detail
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER tquat<T, P> & tquat<T, P>::operator*=(U s)
 	{
 		return (*this = detail::compute_quat_mul_scalar<T, P, detail::is_aligned<P>::value>::call(*this, static_cast<U>(s)));
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER tquat<T, P> & tquat<T, P>::operator/=(U s)
 	{
 		return (*this = detail::compute_quat_div_scalar<T, P, detail::is_aligned<P>::value>::call(*this, static_cast<U>(s)));
@@ -279,13 +279,13 @@ namespace detail
 
 	// -- Unary bit operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> operator+(tquat<T, P> const & q)
 	{
 		return q;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> operator-(tquat<T, P> const & q)
 	{
 		return tquat<T, P>(-q.w, -q.x, -q.y, -q.z);
@@ -293,19 +293,19 @@ namespace detail
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> operator+(tquat<T, P> const & q,	tquat<T, P> const & p)
 	{
 		return tquat<T, P>(q) += p;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> operator*(tquat<T, P> const & q,	tquat<T, P> const & p)
 	{
 		return tquat<T, P>(q) *= p;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator*(tquat<T, P> const & q,	vec<3, T, P> const & v)
 	{
 		vec<3, T, P> const QuatVector(q.x, q.y, q.z);
@@ -315,38 +315,38 @@ namespace detail
 		return v + ((uv * q.w) + uuv) * static_cast<T>(2);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator*(vec<3, T, P> const & v, tquat<T, P> const & q)
 	{
 		return glm::inverse(q) * v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator*(tquat<T, P> const& q, vec<4, T, P> const& v)
 	{
 		return detail::compute_quat_mul_vec4<T, P, detail::is_aligned<P>::value>::call(q, v);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator*(vec<4, T, P> const & v, tquat<T, P> const & q)
 	{
 		return glm::inverse(q) * v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> operator*(tquat<T, P> const & q, T const & s)
 	{
 		return tquat<T, P>(
 			q.w * s, q.x * s, q.y * s, q.z * s);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> operator*(T const & s, tquat<T, P> const & q)
 	{
 		return q * s;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> operator/(tquat<T, P> const & q, T const & s)
 	{
 		return tquat<T, P>(
@@ -355,13 +355,13 @@ namespace detail
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator==(tquat<T, P> const & q1, tquat<T, P> const & q2)
 	{
 		return (q1.x == q2.x) && (q1.y == q2.y) && (q1.z == q2.z) && (q1.w == q2.w);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator!=(tquat<T, P> const & q1, tquat<T, P> const & q2)
 	{
 		return (q1.x != q2.x) || (q1.y != q2.y) || (q1.z != q2.z) || (q1.w != q2.w);
@@ -369,13 +369,13 @@ namespace detail
 
 	// -- Operations --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T length(tquat<T, P> const & q)
 	{
 		return glm::sqrt(dot(q, q));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> normalize(tquat<T, P> const & q)
 	{
 		T len = length(q);
@@ -385,7 +385,7 @@ namespace detail
 		return tquat<T, P>(q.w * oneOverLen, q.x * oneOverLen, q.y * oneOverLen, q.z * oneOverLen);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> cross(tquat<T, P> const & q1, tquat<T, P> const & q2)
 	{
 		return tquat<T, P>(
@@ -396,7 +396,7 @@ namespace detail
 	}
 /*
 	// (x * sin(1 - a) * angle / sin(angle)) + (y * sin(a) * angle / sin(angle))
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> mix(tquat<T, P> const & x, tquat<T, P> const & y, T const & a)
 	{
 		if(a <= T(0)) return x;
@@ -433,7 +433,7 @@ namespace detail
 			k0 * x.z + k1 * y2.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> mix2
 	(
 		tquat<T, P> const & x, 
@@ -471,7 +471,7 @@ namespace detail
 	}
 */
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> mix(tquat<T, P> const & x, tquat<T, P> const & y, T a)
 	{
 		T cosTheta = dot(x, y);
@@ -494,7 +494,7 @@ namespace detail
 		}
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> lerp(tquat<T, P> const & x, tquat<T, P> const & y, T a)
 	{
 		// Lerp is only defined in [0, 1]
@@ -504,7 +504,7 @@ namespace detail
 		return x * (T(1) - a) + (y * a);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> slerp(tquat<T, P> const & x,	tquat<T, P> const & y, T a)
 	{
 		tquat<T, P> z = y;
@@ -537,7 +537,7 @@ namespace detail
 		}
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> rotate(tquat<T, P> const & q, T const & angle, vec<3, T, P> const & v)
 	{
 		vec<3, T, P> Tmp = v;
@@ -559,31 +559,31 @@ namespace detail
 		//return gtc::quaternion::cross(q, tquat<T, P>(cos(AngleRad * T(0.5)), Tmp.x * fSin, Tmp.y * fSin, Tmp.z * fSin));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> eulerAngles(tquat<T, P> const & x)
 	{
 		return vec<3, T, P>(pitch(x), yaw(x), roll(x));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T roll(tquat<T, P> const & q)
 	{
 		return T(atan(T(2) * (q.x * q.y + q.w * q.z), q.w * q.w + q.x * q.x - q.y * q.y - q.z * q.z));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T pitch(tquat<T, P> const & q)
 	{
 		return T(atan(T(2) * (q.y * q.z + q.w * q.x), q.w * q.w - q.x * q.x - q.y * q.y + q.z * q.z));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T yaw(tquat<T, P> const & q)
 	{
 		return asin(clamp(T(-2) * (q.x * q.z - q.w * q.y), T(-1), T(1)));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> mat3_cast(tquat<T, P> const & q)
 	{
 		mat<3, 3, T, P> Result(T(1));
@@ -611,13 +611,13 @@ namespace detail
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> mat4_cast(tquat<T, P> const & q)
 	{
 		return mat<4, 4, T, P>(mat3_cast(q));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> quat_cast(mat<3, 3, T, P> const & m)
 	{
 		T fourXSquaredMinus1 = m[0][0] - m[1][1] - m[2][2];
@@ -681,19 +681,19 @@ namespace detail
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> quat_cast(mat<4, 4, T, P> const & m4)
 	{
 		return quat_cast(mat<3, 3, T, P>(m4));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T angle(tquat<T, P> const & x)
 	{
 		return acos(x.w) * T(2);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> axis(tquat<T, P> const & x)
 	{
 		T tmp1 = static_cast<T>(1) - x.w * x.w;
@@ -703,7 +703,7 @@ namespace detail
 		return vec<3, T, P>(x.x * tmp2, x.y * tmp2, x.z * tmp2);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> angleAxis(T const & angle, vec<3, T, P> const & v)
 	{
 		tquat<T, P> Result(uninitialize);
@@ -718,7 +718,7 @@ namespace detail
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, bool, P> lessThan(tquat<T, P> const & x, tquat<T, P> const & y)
 	{
 		vec<4, bool, P> Result(uninitialize);
@@ -727,7 +727,7 @@ namespace detail
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, bool, P> lessThanEqual(tquat<T, P> const & x, tquat<T, P> const & y)
 	{
 		vec<4, bool, P> Result(uninitialize);
@@ -736,7 +736,7 @@ namespace detail
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, bool, P> greaterThan(tquat<T, P> const & x, tquat<T, P> const & y)
 	{
 		vec<4, bool, P> Result(uninitialize);
@@ -745,7 +745,7 @@ namespace detail
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, bool, P> greaterThanEqual(tquat<T, P> const & x, tquat<T, P> const & y)
 	{
 		vec<4, bool, P> Result(uninitialize);
@@ -754,7 +754,7 @@ namespace detail
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, bool, P> equal(tquat<T, P> const & x, tquat<T, P> const & y)
 	{
 		vec<4, bool, P> Result(uninitialize);
@@ -763,7 +763,7 @@ namespace detail
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, bool, P> notEqual(tquat<T, P> const & x, tquat<T, P> const & y)
 	{
 		vec<4, bool, P> Result(uninitialize);
@@ -772,7 +772,7 @@ namespace detail
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, bool, P> isnan(tquat<T, P> const& q)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isnan' only accept floating-point inputs");
@@ -780,7 +780,7 @@ namespace detail
 		return vec<4, bool, P>(isnan(q.x), isnan(q.y), isnan(q.z), isnan(q.w));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, bool, P> isinf(tquat<T, P> const& q)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isinf' only accept floating-point inputs");
diff --git a/glm/gtc/quaternion_simd.inl b/glm/gtc/quaternion_simd.inl
index 32e84bda..f0f22b5f 100644
--- a/glm/gtc/quaternion_simd.inl
+++ b/glm/gtc/quaternion_simd.inl
@@ -7,7 +7,7 @@ namespace glm{
 namespace detail
 {
 /*
-	template <precision P>
+	template<precision P>
 	struct compute_quat_mul<float, P, true>
 	{
 		static tquat<float, P> call(tquat<float, P> const& q1, tquat<float, P> const& q2)
@@ -61,7 +61,7 @@ namespace detail
 	};
 */
 
-	template <precision P>
+	template<precision P>
 	struct compute_dot<tquat<float, P>, float, true>
 	{
 		static GLM_FUNC_QUALIFIER float call(tquat<float, P> const& x, tquat<float, P> const& y)
@@ -70,7 +70,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_quat_add<float, P, true>
 	{
 		static tquat<float, P> call(tquat<float, P> const& q, tquat<float, P> const& p)
@@ -82,7 +82,7 @@ namespace detail
 	};
 
 #	if GLM_ARCH & GLM_ARCH_AVX_BIT
-	template <precision P>
+	template<precision P>
 	struct compute_quat_add<double, P, true>
 	{
 		static tquat<double, P> call(tquat<double, P> const & a, tquat<double, P> const & b)
@@ -94,7 +94,7 @@ namespace detail
 	};
 #	endif
 
-	template <precision P>
+	template<precision P>
 	struct compute_quat_sub<float, P, true>
 	{
 		static tquat<float, P> call(tquat<float, P> const& q, tquat<float, P> const& p)
@@ -106,7 +106,7 @@ namespace detail
 	};
 
 #	if GLM_ARCH & GLM_ARCH_AVX_BIT
-	template <precision P>
+	template<precision P>
 	struct compute_quat_sub<double, P, true>
 	{
 		static tquat<double, P> call(tquat<double, P> const & a, tquat<double, P> const & b)
@@ -118,7 +118,7 @@ namespace detail
 	};
 #	endif
 
-	template <precision P>
+	template<precision P>
 	struct compute_quat_mul_scalar<float, P, true>
 	{
 		static tquat<float, P> call(tquat<float, P> const& q, float s)
@@ -130,7 +130,7 @@ namespace detail
 	};
 
 #	if GLM_ARCH & GLM_ARCH_AVX_BIT
-	template <precision P>
+	template<precision P>
 	struct compute_quat_mul_scalar<double, P, true>
 	{
 		static tquat<double, P> call(tquat<double, P> const& q, double s)
@@ -142,7 +142,7 @@ namespace detail
 	};
 #	endif
 
-	template <precision P>
+	template<precision P>
 	struct compute_quat_div_scalar<float, P, true>
 	{
 		static tquat<float, P> call(tquat<float, P> const& q, float s)
@@ -154,7 +154,7 @@ namespace detail
 	};
 
 #	if GLM_ARCH & GLM_ARCH_AVX_BIT
-	template <precision P>
+	template<precision P>
 	struct compute_quat_div_scalar<double, P, true>
 	{
 		static tquat<double, P> call(tquat<double, P> const& q, double s)
@@ -166,7 +166,7 @@ namespace detail
 	};
 #	endif
 
-	template <precision P>
+	template<precision P>
 	struct compute_quat_mul_vec4<float, P, true>
 	{
 		static vec<4, float, P> call(tquat<float, P> const& q, vec<4, float, P> const& v)
diff --git a/glm/gtc/random.hpp b/glm/gtc/random.hpp
index 0abf27bb..f8d9f729 100644
--- a/glm/gtc/random.hpp
+++ b/glm/gtc/random.hpp
@@ -32,7 +32,7 @@ namespace glm
 	/// @param Max 
 	/// @tparam genType Value type. Currently supported: float or double scalars.
 	/// @see gtc_random
-	template <typename genTYpe>
+	template<typename genTYpe>
 	GLM_FUNC_DECL genTYpe linearRand(
 		genTYpe Min,
 		genTYpe Max);
@@ -44,17 +44,17 @@ namespace glm
 	/// @tparam T Value type. Currently supported: float or double.
 	/// @tparam vecType A vertor type: tvec1, tvec2, tvec3, tvec4 or compatible
 	/// @see gtc_random
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> linearRand(
-		vecType<D, T, P> const & Min,
-		vecType<D, T, P> const & Max);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> linearRand(
+		vecType<L, T, P> const& Min,
+		vecType<L, T, P> const& Max);
 
 	/// Generate random numbers in the interval [Min, Max], according a gaussian distribution 
 	/// 
 	/// @param Mean
 	/// @param Deviation
 	/// @see gtc_random
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType gaussRand(
 		genType Mean,
 		genType Deviation);
@@ -63,7 +63,7 @@ namespace glm
 	/// 
 	/// @param Radius 
 	/// @see gtc_random
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL vec<2, T, defaultp> circularRand(
 		T Radius);
 	
@@ -71,7 +71,7 @@ namespace glm
 	/// 
 	/// @param Radius
 	/// @see gtc_random
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL vec<3, T, defaultp> sphericalRand(
 		T Radius);
 	
@@ -79,7 +79,7 @@ namespace glm
 	/// 
 	/// @param Radius
 	/// @see gtc_random
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL vec<2, T, defaultp> diskRand(
 		T Radius);
 	
@@ -87,7 +87,7 @@ namespace glm
 	/// 
 	/// @param Radius
 	/// @see gtc_random
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL vec<3, T, defaultp> ballRand(
 		T Radius);
 	
diff --git a/glm/gtc/random.inl b/glm/gtc/random.inl
index dfc05fdf..834c485c 100644
--- a/glm/gtc/random.inl
+++ b/glm/gtc/random.inl
@@ -10,13 +10,13 @@
 namespace glm{
 namespace detail
 {
-	template <int D, typename T, precision P, template <int, class, precision> class vecType>
+	template<length_t L, typename T, precision P, template<int, class, precision> class vecType>
 	struct compute_rand
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call();
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call();
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_rand<1, uint8, P, vec>
 	{
 		GLM_FUNC_QUALIFIER static vec<1, uint8, P> call()
@@ -26,7 +26,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_rand<2, uint8, P, vec>
 	{
 		GLM_FUNC_QUALIFIER static vec<2, uint8, P> call()
@@ -37,7 +37,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_rand<3, uint8, P, vec>
 	{
 		GLM_FUNC_QUALIFIER static vec<3, uint8, P> call()
@@ -49,7 +49,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_rand<4, uint8, P, vec>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, uint8, P> call()
@@ -62,200 +62,200 @@ namespace detail
 		}
 	};
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	struct compute_rand<D, uint16, P, vecType>
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_rand<L, uint16, P, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, uint16, P> call()
+		GLM_FUNC_QUALIFIER static vecType<L, uint16, P> call()
 		{
 			return
-				(vecType<D, uint16, P>(compute_rand<D, uint8, P, vecType>::call()) << static_cast<uint16>(8)) |
-				(vecType<D, uint16, P>(compute_rand<D, uint8, P, vecType>::call()) << static_cast<uint16>(0));
+				(vecType<L, uint16, P>(compute_rand<L, uint8, P, vecType>::call()) << static_cast<uint16>(8)) |
+				(vecType<L, uint16, P>(compute_rand<L, uint8, P, vecType>::call()) << static_cast<uint16>(0));
 		}
 	};
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	struct compute_rand<D, uint32, P, vecType>
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_rand<L, uint32, P, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, uint32, P> call()
+		GLM_FUNC_QUALIFIER static vecType<L, uint32, P> call()
 		{
 			return
-				(vecType<D, uint32, P>(compute_rand<D, uint16, P, vecType>::call()) << static_cast<uint32>(16)) |
-				(vecType<D, uint32, P>(compute_rand<D, uint16, P, vecType>::call()) << static_cast<uint32>(0));
+				(vecType<L, uint32, P>(compute_rand<L, uint16, P, vecType>::call()) << static_cast<uint32>(16)) |
+				(vecType<L, uint32, P>(compute_rand<L, uint16, P, vecType>::call()) << static_cast<uint32>(0));
 		}
 	};
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	struct compute_rand<D, uint64, P, vecType>
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_rand<L, uint64, P, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, uint64, P> call()
+		GLM_FUNC_QUALIFIER static vecType<L, uint64, P> call()
 		{
 			return
-				(vecType<D, uint64, P>(compute_rand<D, uint32, P, vecType>::call()) << static_cast<uint64>(32)) |
-				(vecType<D, uint64, P>(compute_rand<D, uint32, P, vecType>::call()) << static_cast<uint64>(0));
+				(vecType<L, uint64, P>(compute_rand<L, uint32, P, vecType>::call()) << static_cast<uint64>(32)) |
+				(vecType<L, uint64, P>(compute_rand<L, uint32, P, vecType>::call()) << static_cast<uint64>(0));
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	struct compute_linearRand
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & Min, vecType<D, T, P> const & Max);
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & Min, vecType<L, T, P> const & Max);
 	};
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, int8, P, vecType>
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, int8, P, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, int8, P> call(vecType<D, int8, P> const & Min, vecType<D, int8, P> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, int8, P> call(vecType<L, int8, P> const & Min, vecType<L, int8, P> const & Max)
 		{
-			return (vecType<D, int8, P>(compute_rand<D, uint8, P, vecType>::call() % vecType<D, uint8, P>(Max + static_cast<int8>(1) - Min))) + Min;
+			return (vecType<L, int8, P>(compute_rand<L, uint8, P, vecType>::call() % vecType<L, uint8, P>(Max + static_cast<int8>(1) - Min))) + Min;
 		}
 	};
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, uint8, P, vecType>
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, uint8, P, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, uint8, P> call(vecType<D, uint8, P> const & Min, vecType<D, uint8, P> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, uint8, P> call(vecType<L, uint8, P> const & Min, vecType<L, uint8, P> const & Max)
 		{
-			return (compute_rand<D, uint8, P, vecType>::call() % (Max + static_cast<uint8>(1) - Min)) + Min;
+			return (compute_rand<L, uint8, P, vecType>::call() % (Max + static_cast<uint8>(1) - Min)) + Min;
 		}
 	};
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, int16, P, vecType>
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, int16, P, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, int16, P> call(vecType<D, int16, P> const & Min, vecType<D, int16, P> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, int16, P> call(vecType<L, int16, P> const & Min, vecType<L, int16, P> const & Max)
 		{
-			return (vecType<D, int16, P>(compute_rand<D, uint16, P, vecType>::call() % vecType<D, uint16, P>(Max + static_cast<int16>(1) - Min))) + Min;
+			return (vecType<L, int16, P>(compute_rand<L, uint16, P, vecType>::call() % vecType<L, uint16, P>(Max + static_cast<int16>(1) - Min))) + Min;
 		}
 	};
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, uint16, P, vecType>
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, uint16, P, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, uint16, P> call(vecType<D, uint16, P> const & Min, vecType<D, uint16, P> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, uint16, P> call(vecType<L, uint16, P> const & Min, vecType<L, uint16, P> const & Max)
 		{
-			return (compute_rand<D, uint16, P, vecType>::call() % (Max + static_cast<uint16>(1) - Min)) + Min;
+			return (compute_rand<L, uint16, P, vecType>::call() % (Max + static_cast<uint16>(1) - Min)) + Min;
 		}
 	};
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, int32, P, vecType>
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, int32, P, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, int32, P> call(vecType<D, int32, P> const & Min, vecType<D, int32, P> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, int32, P> call(vecType<L, int32, P> const & Min, vecType<L, int32, P> const & Max)
 		{
-			return (vecType<D, int32, P>(compute_rand<D, uint32, P, vecType>::call() % vecType<D, uint32, P>(Max + static_cast<int32>(1) - Min))) + Min;
+			return (vecType<L, int32, P>(compute_rand<L, uint32, P, vecType>::call() % vecType<L, uint32, P>(Max + static_cast<int32>(1) - Min))) + Min;
 		}
 	};
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, uint32, P, vecType>
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, uint32, P, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, uint32, P> call(vecType<D, uint32, P> const & Min, vecType<D, uint32, P> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, uint32, P> call(vecType<L, uint32, P> const & Min, vecType<L, uint32, P> const & Max)
 		{
-			return (compute_rand<D, uint32, P, vecType>::call() % (Max + static_cast<uint32>(1) - Min)) + Min;
+			return (compute_rand<L, uint32, P, vecType>::call() % (Max + static_cast<uint32>(1) - Min)) + Min;
 		}
 	};
  
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, int64, P, vecType>
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, int64, P, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, int64, P> call(vecType<D, int64, P> const & Min, vecType<D, int64, P> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, int64, P> call(vecType<L, int64, P> const & Min, vecType<L, int64, P> const & Max)
 		{
-			return (vecType<D, int64, P>(compute_rand<D, uint64, P, vecType>::call() % vecType<D, uint64, P>(Max + static_cast<int64>(1) - Min))) + Min;
+			return (vecType<L, int64, P>(compute_rand<L, uint64, P, vecType>::call() % vecType<L, uint64, P>(Max + static_cast<int64>(1) - Min))) + Min;
 		}
 	};
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, uint64, P, vecType>
+	template<length_t L, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, uint64, P, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, uint64, P> call(vecType<D, uint64, P> const & Min, vecType<D, uint64, P> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, uint64, P> call(vecType<L, uint64, P> const & Min, vecType<L, uint64, P> const & Max)
 		{
-			return (compute_rand<D, uint64, P, vecType>::call() % (Max + static_cast<uint64>(1) - Min)) + Min;
+			return (compute_rand<L, uint64, P, vecType>::call() % (Max + static_cast<uint64>(1) - Min)) + Min;
 		}
 	};
 
-	template <int D, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, float, lowp, vecType>
+	template<length_t L, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, float, lowp, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, float, lowp> call(vecType<D, float, lowp> const & Min, vecType<D, float, lowp> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, float, lowp> call(vecType<L, float, lowp> const & Min, vecType<L, float, lowp> const & Max)
 		{
-			return vecType<D, float, lowp>(compute_rand<D, uint8, lowp, vecType>::call()) / static_cast<float>(std::numeric_limits<uint8>::max()) * (Max - Min) + Min;
+			return vecType<L, float, lowp>(compute_rand<L, uint8, lowp, vecType>::call()) / static_cast<float>(std::numeric_limits<uint8>::max()) * (Max - Min) + Min;
 		}
 	};
 
-	template <int D, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, float, mediump, vecType>
+	template<length_t L, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, float, mediump, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, float, mediump> call(vecType<D, float, mediump> const & Min, vecType<D, float, mediump> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, float, mediump> call(vecType<L, float, mediump> const & Min, vecType<L, float, mediump> const & Max)
 		{
-			return vecType<D, float, mediump>(compute_rand<D, uint16, mediump, vecType>::call()) / static_cast<float>(std::numeric_limits<uint16>::max()) * (Max - Min) + Min;
+			return vecType<L, float, mediump>(compute_rand<L, uint16, mediump, vecType>::call()) / static_cast<float>(std::numeric_limits<uint16>::max()) * (Max - Min) + Min;
 		}
 	};
 
-	template <int D, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, float, highp, vecType>
+	template<length_t L, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, float, highp, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, float, highp> call(vecType<D, float, highp> const & Min, vecType<D, float, highp> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, float, highp> call(vecType<L, float, highp> const & Min, vecType<L, float, highp> const & Max)
 		{
-			return vecType<D, float, highp>(compute_rand<D, uint32, highp, vecType>::call()) / static_cast<float>(std::numeric_limits<uint32>::max()) * (Max - Min) + Min;
+			return vecType<L, float, highp>(compute_rand<L, uint32, highp, vecType>::call()) / static_cast<float>(std::numeric_limits<uint32>::max()) * (Max - Min) + Min;
 		}
 	};
 
-	template <int D, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, double, lowp, vecType>
+	template<length_t L, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, double, lowp, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, double, lowp> call(vecType<D, double, lowp> const & Min, vecType<D, double, lowp> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, double, lowp> call(vecType<L, double, lowp> const & Min, vecType<L, double, lowp> const & Max)
 		{
-			return vecType<D, double, lowp>(compute_rand<D, uint16, lowp, vecType>::call()) / static_cast<double>(std::numeric_limits<uint16>::max()) * (Max - Min) + Min;
+			return vecType<L, double, lowp>(compute_rand<L, uint16, lowp, vecType>::call()) / static_cast<double>(std::numeric_limits<uint16>::max()) * (Max - Min) + Min;
 		}
 	};
 
-	template <int D, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, double, mediump, vecType>
+	template<length_t L, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, double, mediump, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, double, mediump> call(vecType<D, double, mediump> const & Min, vecType<D, double, mediump> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, double, mediump> call(vecType<L, double, mediump> const & Min, vecType<L, double, mediump> const & Max)
 		{
-			return vecType<D, double, mediump>(compute_rand<D, uint32, mediump, vecType>::call()) / static_cast<double>(std::numeric_limits<uint32>::max()) * (Max - Min) + Min;
+			return vecType<L, double, mediump>(compute_rand<L, uint32, mediump, vecType>::call()) / static_cast<double>(std::numeric_limits<uint32>::max()) * (Max - Min) + Min;
 		}
 	};
 
-	template <int D, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, double, highp, vecType>
+	template<length_t L, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, double, highp, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, double, highp> call(vecType<D, double, highp> const & Min, vecType<D, double, highp> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, double, highp> call(vecType<L, double, highp> const & Min, vecType<L, double, highp> const & Max)
 		{
-			return vecType<D, double, highp>(compute_rand<D, uint64, highp, vecType>::call()) / static_cast<double>(std::numeric_limits<uint64>::max()) * (Max - Min) + Min;
+			return vecType<L, double, highp>(compute_rand<L, uint64, highp, vecType>::call()) / static_cast<double>(std::numeric_limits<uint64>::max()) * (Max - Min) + Min;
 		}
 	};
 
-	template <int D, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, long double, lowp, vecType>
+	template<length_t L, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, long double, lowp, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, long double, lowp> call(vecType<D, long double, lowp> const & Min, vecType<D, long double, lowp> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, long double, lowp> call(vecType<L, long double, lowp> const & Min, vecType<L, long double, lowp> const & Max)
 		{
-			return vecType<D, long double, lowp>(compute_rand<D, uint32, lowp, vecType>::call()) / static_cast<long double>(std::numeric_limits<uint32>::max()) * (Max - Min) + Min;
+			return vecType<L, long double, lowp>(compute_rand<L, uint32, lowp, vecType>::call()) / static_cast<long double>(std::numeric_limits<uint32>::max()) * (Max - Min) + Min;
 		}
 	};
 
-	template <int D, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, long double, mediump, vecType>
+	template<length_t L, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, long double, mediump, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, long double, mediump> call(vecType<D, long double, mediump> const & Min, vecType<D, long double, mediump> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, long double, mediump> call(vecType<L, long double, mediump> const & Min, vecType<L, long double, mediump> const & Max)
 		{
-			return vecType<D, long double, mediump>(compute_rand<D, uint64, mediump, vecType>::call()) / static_cast<long double>(std::numeric_limits<uint64>::max()) * (Max - Min) + Min;
+			return vecType<L, long double, mediump>(compute_rand<L, uint64, mediump, vecType>::call()) / static_cast<long double>(std::numeric_limits<uint64>::max()) * (Max - Min) + Min;
 		}
 	};
 
-	template <int D, template <int, typename, precision> class vecType>
-	struct compute_linearRand<D, long double, highp, vecType>
+	template<length_t L, template<length_t, typename, precision> class vecType>
+	struct compute_linearRand<L, long double, highp, vecType>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, long double, highp> call(vecType<D, long double, highp> const & Min, vecType<D, long double, highp> const & Max)
+		GLM_FUNC_QUALIFIER static vecType<L, long double, highp> call(vecType<L, long double, highp> const & Min, vecType<L, long double, highp> const & Max)
 		{
-			return vecType<D, long double, highp>(compute_rand<D, uint64, highp, vecType>::call()) / static_cast<long double>(std::numeric_limits<uint64>::max()) * (Max - Min) + Min;
+			return vecType<L, long double, highp>(compute_rand<L, uint64, highp, vecType>::call()) / static_cast<long double>(std::numeric_limits<uint64>::max()) * (Max - Min) + Min;
 		}
 	};
 }//namespace detail
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType linearRand(genType Min, genType Max)
 	{
 		return detail::compute_linearRand<1, genType, highp, vec>::call(
@@ -263,13 +263,13 @@ namespace detail
 			vec<1, genType, highp>(Max)).x;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> linearRand(vecType<D, T, P> const & Min, vecType<D, T, P> const & Max)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> linearRand(vecType<L, T, P> const & Min, vecType<L, T, P> const & Max)
 	{
-		return detail::compute_linearRand<D, T, P, vecType>::call(Min, Max);
+		return detail::compute_linearRand<L, T, P, vecType>::call(Min, Max);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType gaussRand(genType Mean, genType Deviation)
 	{
 		genType w, x1, x2;
@@ -285,13 +285,13 @@ namespace detail
 		return x2 * Deviation * Deviation * sqrt((genType(-2) * log(w)) / w) + Mean;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> gaussRand(vecType<D, T, P> const & Mean, vecType<D, T, P> const & Deviation)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> gaussRand(vecType<L, T, P> const & Mean, vecType<L, T, P> const & Deviation)
 	{
-		return detail::functor2<D, T, P>::call(gaussRand, Mean, Deviation);
+		return detail::functor2<L, T, P>::call(gaussRand, Mean, Deviation);
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER vec<2, T, defaultp> diskRand(T Radius)
 	{		
 		vec<2, T, defaultp> Result(T(0));
@@ -309,7 +309,7 @@ namespace detail
 		return Result;
 	}
 	
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER vec<3, T, defaultp> ballRand(T Radius)
 	{		
 		vec<3, T, defaultp> Result(T(0));
@@ -327,14 +327,14 @@ namespace detail
 		return Result;
 	}
 	
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER vec<2, T, defaultp> circularRand(T Radius)
 	{
 		T a = linearRand(T(0), T(6.283185307179586476925286766559f));
 		return vec<2, T, defaultp>(cos(a), sin(a)) * Radius;		
 	}
 	
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER vec<3, T, defaultp> sphericalRand(T Radius)
 	{
 		T z = linearRand(T(-1), T(1));
diff --git a/glm/gtc/reciprocal.hpp b/glm/gtc/reciprocal.hpp
index c14a4fec..6b09e06b 100644
--- a/glm/gtc/reciprocal.hpp
+++ b/glm/gtc/reciprocal.hpp
@@ -30,7 +30,7 @@ namespace glm
 	/// @tparam genType Floating-point scalar or vector types.
 	/// 
 	/// @see gtc_reciprocal
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType sec(genType angle);
 
 	/// Cosecant function.
@@ -39,7 +39,7 @@ namespace glm
 	/// @tparam genType Floating-point scalar or vector types.
 	/// 
 	/// @see gtc_reciprocal
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_DECL genType csc(genType angle);
 		
 	/// Cotangent function.
@@ -48,7 +48,7 @@ namespace glm
 	/// @tparam genType Floating-point scalar or vector types.
 	/// 
 	/// @see gtc_reciprocal
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType cot(genType angle);
 
 	/// Inverse secant function.
@@ -57,7 +57,7 @@ namespace glm
 	/// @tparam genType Floating-point scalar or vector types.
 	/// 
 	/// @see gtc_reciprocal
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType asec(genType x);
 
 	/// Inverse cosecant function.
@@ -66,7 +66,7 @@ namespace glm
 	/// @tparam genType Floating-point scalar or vector types.
 	/// 
 	/// @see gtc_reciprocal
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType acsc(genType x);
 		
 	/// Inverse cotangent function.
@@ -75,7 +75,7 @@ namespace glm
 	/// @tparam genType Floating-point scalar or vector types.
 	/// 
 	/// @see gtc_reciprocal
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType acot(genType x);
 
 	/// Secant hyperbolic function.
@@ -83,7 +83,7 @@ namespace glm
 	/// @tparam genType Floating-point scalar or vector types.
 	/// 
 	/// @see gtc_reciprocal
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType sech(genType angle);
 
 	/// Cosecant hyperbolic function.
@@ -91,7 +91,7 @@ namespace glm
 	/// @tparam genType Floating-point scalar or vector types.
 	/// 
 	/// @see gtc_reciprocal
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType csch(genType angle);
 		
 	/// Cotangent hyperbolic function.
@@ -99,7 +99,7 @@ namespace glm
 	/// @tparam genType Floating-point scalar or vector types.
 	/// 
 	/// @see gtc_reciprocal
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType coth(genType angle);
 
 	/// Inverse secant hyperbolic function.
@@ -108,7 +108,7 @@ namespace glm
 	/// @tparam genType Floating-point scalar or vector types.
 	/// 
 	/// @see gtc_reciprocal
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType asech(genType x);
 
 	/// Inverse cosecant hyperbolic function.
@@ -117,7 +117,7 @@ namespace glm
 	/// @tparam genType Floating-point scalar or vector types.
 	/// 
 	/// @see gtc_reciprocal
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType acsch(genType x);
 		
 	/// Inverse cotangent hyperbolic function.
@@ -126,7 +126,7 @@ namespace glm
 	/// @tparam genType Floating-point scalar or vector types.
 	/// 
 	/// @see gtc_reciprocal
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType acoth(genType x);
 
 	/// @}
diff --git a/glm/gtc/reciprocal.inl b/glm/gtc/reciprocal.inl
index f042ebe1..1c667ad3 100644
--- a/glm/gtc/reciprocal.inl
+++ b/glm/gtc/reciprocal.inl
@@ -7,37 +7,37 @@
 namespace glm
 {
 	// sec
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType sec(genType angle)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'sec' only accept floating-point values");
 		return genType(1) / glm::cos(angle);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> sec(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> sec(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'sec' only accept floating-point inputs");
-		return detail::functor1<D, T, T, P>::call(sec, x);
+		return detail::functor1<L, T, T, P>::call(sec, x);
 	}
 
 	// csc
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType csc(genType angle)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'csc' only accept floating-point values");
 		return genType(1) / glm::sin(angle);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> csc(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> csc(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'csc' only accept floating-point inputs");
-		return detail::functor1<D, T, T, P>::call(csc, x);
+		return detail::functor1<L, T, T, P>::call(csc, x);
 	}
 
 	// cot
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType cot(genType angle)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'cot' only accept floating-point values");
@@ -46,45 +46,45 @@ namespace glm
 		return glm::tan(pi_over_2 - angle);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> cot(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> cot(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'cot' only accept floating-point inputs");
-		return detail::functor1<D, T, T, P>::call(cot, x);
+		return detail::functor1<L, T, T, P>::call(cot, x);
 	}
 
 	// asec
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType asec(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'asec' only accept floating-point values");
 		return acos(genType(1) / x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> asec(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> asec(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'asec' only accept floating-point inputs");
-		return detail::functor1<D, T, T, P>::call(asec, x);
+		return detail::functor1<L, T, T, P>::call(asec, x);
 	}
 
 	// acsc
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType acsc(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'acsc' only accept floating-point values");
 		return asin(genType(1) / x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> acsc(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> acsc(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'acsc' only accept floating-point inputs");
-		return detail::functor1<D, T, T, P>::call(acsc, x);
+		return detail::functor1<L, T, T, P>::call(acsc, x);
 	}
 
 	// acot
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType acot(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'acot' only accept floating-point values");
@@ -93,100 +93,100 @@ namespace glm
 		return pi_over_2 - atan(x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> acot(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> acot(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'acot' only accept floating-point inputs");
-		return detail::functor1<D, T, T, P>::call(acot, x);
+		return detail::functor1<L, T, T, P>::call(acot, x);
 	}
 
 	// sech
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType sech(genType angle)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'sech' only accept floating-point values");
 		return genType(1) / glm::cosh(angle);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> sech(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> sech(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'sech' only accept floating-point inputs");
-		return detail::functor1<D, T, T, P>::call(sech, x);
+		return detail::functor1<L, T, T, P>::call(sech, x);
 	}
 
 	// csch
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType csch(genType angle)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'csch' only accept floating-point values");
 		return genType(1) / glm::sinh(angle);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> csch(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> csch(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'csch' only accept floating-point inputs");
-		return detail::functor1<D, T, T, P>::call(csch, x);
+		return detail::functor1<L, T, T, P>::call(csch, x);
 	}
 
 	// coth
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType coth(genType angle)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'coth' only accept floating-point values");
 		return glm::cosh(angle) / glm::sinh(angle);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> coth(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> coth(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'coth' only accept floating-point inputs");
-		return detail::functor1<D, T, T, P>::call(coth, x);
+		return detail::functor1<L, T, T, P>::call(coth, x);
 	}
 
 	// asech
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType asech(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'asech' only accept floating-point values");
 		return acosh(genType(1) / x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> asech(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> asech(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'asech' only accept floating-point inputs");
-		return detail::functor1<D, T, T, P>::call(asech, x);
+		return detail::functor1<L, T, T, P>::call(asech, x);
 	}
 
 	// acsch
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType acsch(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'acsch' only accept floating-point values");
 		return acsch(genType(1) / x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> acsch(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> acsch(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'acsch' only accept floating-point inputs");
-		return detail::functor1<D, T, T, P>::call(acsch, x);
+		return detail::functor1<L, T, T, P>::call(acsch, x);
 	}
 
 	// acoth
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType acoth(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'acoth' only accept floating-point values");
 		return atanh(genType(1) / x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> acoth(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> acoth(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'acoth' only accept floating-point inputs");
-		return detail::functor1<D, T, T, P>::call(acoth, x);
+		return detail::functor1<L, T, T, P>::call(acoth, x);
 	}
 }//namespace glm
diff --git a/glm/gtc/round.hpp b/glm/gtc/round.hpp
index a5c3348e..3520e436 100644
--- a/glm/gtc/round.hpp
+++ b/glm/gtc/round.hpp
@@ -33,72 +33,72 @@ namespace glm
 	/// Return true if the value is a power of two number.
 	///
 	/// @see gtc_round
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL bool isPowerOfTwo(genIUType Value);
 
 	/// Return true if the value is a power of two number.
 	///
 	/// @see gtc_round
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, bool, P> isPowerOfTwo(vecType<D, T, P> const & value);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, bool, P> isPowerOfTwo(vecType<L, T, P> const & value);
 
 	/// Return the power of two number which value is just higher the input value,
 	/// round up to a power of two.
 	///
 	/// @see gtc_round
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL genIUType ceilPowerOfTwo(genIUType Value);
 
 	/// Return the power of two number which value is just higher the input value,
 	/// round up to a power of two.
 	///
 	/// @see gtc_round
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> ceilPowerOfTwo(vecType<D, T, P> const & value);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> ceilPowerOfTwo(vecType<L, T, P> const & value);
 
 	/// Return the power of two number which value is just lower the input value,
 	/// round down to a power of two.
 	///
 	/// @see gtc_round
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL genIUType floorPowerOfTwo(genIUType Value);
 
 	/// Return the power of two number which value is just lower the input value,
 	/// round down to a power of two.
 	///
 	/// @see gtc_round
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> floorPowerOfTwo(vecType<D, T, P> const & value);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> floorPowerOfTwo(vecType<L, T, P> const & value);
 
 	/// Return the power of two number which value is the closet to the input value.
 	///
 	/// @see gtc_round
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL genIUType roundPowerOfTwo(genIUType Value);
 
 	/// Return the power of two number which value is the closet to the input value.
 	///
 	/// @see gtc_round
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> roundPowerOfTwo(vecType<D, T, P> const & value);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> roundPowerOfTwo(vecType<L, T, P> const & value);
 
 	/// Return true if the 'Value' is a multiple of 'Multiple'.
 	///
 	/// @see gtc_round
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL bool isMultiple(genIUType Value, genIUType Multiple);
 
 	/// Return true if the 'Value' is a multiple of 'Multiple'.
 	///
 	/// @see gtc_round
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, bool, P> isMultiple(vecType<D, T, P> const & Value, T Multiple);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, bool, P> isMultiple(vecType<L, T, P> const & Value, T Multiple);
 
 	/// Return true if the 'Value' is a multiple of 'Multiple'.
 	///
 	/// @see gtc_round
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, bool, P> isMultiple(vecType<D, T, P> const & Value, vecType<D, T, P> const & Multiple);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, bool, P> isMultiple(vecType<L, T, P> const & Value, vecType<L, T, P> const & Multiple);
 
 	/// Higher multiple number of Source.
 	///
@@ -107,7 +107,7 @@ namespace glm
 	/// @param Multiple Must be a null or positive value
 	///
 	/// @see gtc_round
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType ceilMultiple(genType Source, genType Multiple);
 
 	/// Higher multiple number of Source.
@@ -117,8 +117,8 @@ namespace glm
 	/// @param Multiple Must be a null or positive value
 	///
 	/// @see gtc_round
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> ceilMultiple(vecType<D, T, P> const & Source, vecType<D, T, P> const & Multiple);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> ceilMultiple(vecType<L, T, P> const & Source, vecType<L, T, P> const & Multiple);
 
 	/// Lower multiple number of Source.
 	///
@@ -127,7 +127,7 @@ namespace glm
 	/// @param Multiple Must be a null or positive value
 	///
 	/// @see gtc_round
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType floorMultiple(
 		genType Source,
 		genType Multiple);
@@ -139,10 +139,10 @@ namespace glm
 	/// @param Multiple Must be a null or positive value
 	///
 	/// @see gtc_round
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> floorMultiple(
-		vecType<D, T, P> const & Source,
-		vecType<D, T, P> const & Multiple);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> floorMultiple(
+		vecType<L, T, P> const& Source,
+		vecType<L, T, P> const& Multiple);
 
 	/// Lower multiple number of Source.
 	///
@@ -151,7 +151,7 @@ namespace glm
 	/// @param Multiple Must be a null or positive value
 	///
 	/// @see gtc_round
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType roundMultiple(
 		genType Source,
 		genType Multiple);
@@ -163,10 +163,10 @@ namespace glm
 	/// @param Multiple Must be a null or positive value
 	///
 	/// @see gtc_round
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> roundMultiple(
-		vecType<D, T, P> const & Source,
-		vecType<D, T, P> const & Multiple);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> roundMultiple(
+		vecType<L, T, P> const& Source,
+		vecType<L, T, P> const& Multiple);
 
 	/// @}
 } //namespace glm
diff --git a/glm/gtc/round.inl b/glm/gtc/round.inl
index 282db47d..9ddf50ea 100644
--- a/glm/gtc/round.inl
+++ b/glm/gtc/round.inl
@@ -6,73 +6,73 @@
 namespace glm{
 namespace detail
 {
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool compute = false>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool compute = false>
 	struct compute_ceilShift
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & v, T)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & v, T)
 		{
 			return v;
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	struct compute_ceilShift<D, T, P, vecType, true>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_ceilShift<L, T, P, vecType, true>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & v, T Shift)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & v, T Shift)
 		{
 			return v | (v >> Shift);
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool isSigned = true>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool isSigned = true>
 	struct compute_ceilPowerOfTwo
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x)
 		{
 			GLM_STATIC_ASSERT(!std::numeric_limits<T>::is_iec559, "'ceilPowerOfTwo' only accept integer scalar or vector inputs");
 
-			vecType<D, T, P> const Sign(sign(x));
+			vecType<L, T, P> const Sign(sign(x));
 
-			vecType<D, T, P> v(abs(x));
+			vecType<L, T, P> v(abs(x));
 
 			v = v - static_cast<T>(1);
 			v = v | (v >> static_cast<T>(1));
 			v = v | (v >> static_cast<T>(2));
 			v = v | (v >> static_cast<T>(4));
-			v = compute_ceilShift<D, T, P, vecType, sizeof(T) >= 2>::call(v, 8);
-			v = compute_ceilShift<D, T, P, vecType, sizeof(T) >= 4>::call(v, 16);
-			v = compute_ceilShift<D, T, P, vecType, sizeof(T) >= 8>::call(v, 32);
+			v = compute_ceilShift<L, T, P, vecType, sizeof(T) >= 2>::call(v, 8);
+			v = compute_ceilShift<L, T, P, vecType, sizeof(T) >= 4>::call(v, 16);
+			v = compute_ceilShift<L, T, P, vecType, sizeof(T) >= 8>::call(v, 32);
 			return (v + static_cast<T>(1)) * Sign;
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	struct compute_ceilPowerOfTwo<D, T, P, vecType, false>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_ceilPowerOfTwo<L, T, P, vecType, false>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & x)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & x)
 		{
 			GLM_STATIC_ASSERT(!std::numeric_limits<T>::is_iec559, "'ceilPowerOfTwo' only accept integer scalar or vector inputs");
 
-			vecType<D, T, P> v(x);
+			vecType<L, T, P> v(x);
 
 			v = v - static_cast<T>(1);
 			v = v | (v >> static_cast<T>(1));
 			v = v | (v >> static_cast<T>(2));
 			v = v | (v >> static_cast<T>(4));
-			v = compute_ceilShift<D, T, P, vecType, sizeof(T) >= 2>::call(v, 8);
-			v = compute_ceilShift<D, T, P, vecType, sizeof(T) >= 4>::call(v, 16);
-			v = compute_ceilShift<D, T, P, vecType, sizeof(T) >= 8>::call(v, 32);
+			v = compute_ceilShift<L, T, P, vecType, sizeof(T) >= 2>::call(v, 8);
+			v = compute_ceilShift<L, T, P, vecType, sizeof(T) >= 4>::call(v, 16);
+			v = compute_ceilShift<L, T, P, vecType, sizeof(T) >= 8>::call(v, 32);
 			return v + static_cast<T>(1);
 		}
 	};
 
-	template <bool is_float, bool is_signed>
+	template<bool is_float, bool is_signed>
 	struct compute_ceilMultiple{};
 
-	template <>
+	template<>
 	struct compute_ceilMultiple<true, true>
 	{
-		template <typename genType>
+		template<typename genType>
 		GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
 		{
 			if(Source > genType(0))
@@ -82,10 +82,10 @@ namespace detail
 		}
 	};
 
-	template <>
+	template<>
 	struct compute_ceilMultiple<false, false>
 	{
-		template <typename genType>
+		template<typename genType>
 		GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
 		{
 			genType Tmp = Source - genType(1);
@@ -93,10 +93,10 @@ namespace detail
 		}
 	};
 
-	template <>
+	template<>
 	struct compute_ceilMultiple<false, true>
 	{
-		template <typename genType>
+		template<typename genType>
 		GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
 		{
 			if(Source > genType(0))
@@ -109,13 +109,13 @@ namespace detail
 		}
 	};
 
-	template <bool is_float, bool is_signed>
+	template<bool is_float, bool is_signed>
 	struct compute_floorMultiple{};
 
-	template <>
+	template<>
 	struct compute_floorMultiple<true, true>
 	{
-		template <typename genType>
+		template<typename genType>
 		GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
 		{
 			if(Source >= genType(0))
@@ -125,10 +125,10 @@ namespace detail
 		}
 	};
 
-	template <>
+	template<>
 	struct compute_floorMultiple<false, false>
 	{
-		template <typename genType>
+		template<typename genType>
 		GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
 		{
 			if(Source >= genType(0))
@@ -141,10 +141,10 @@ namespace detail
 		}
 	};
 
-	template <>
+	template<>
 	struct compute_floorMultiple<false, true>
 	{
-		template <typename genType>
+		template<typename genType>
 		GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
 		{
 			if(Source >= genType(0))
@@ -157,13 +157,13 @@ namespace detail
 		}
 	};
 
-	template <bool is_float, bool is_signed>
+	template<bool is_float, bool is_signed>
 	struct compute_roundMultiple{};
 
-	template <>
+	template<>
 	struct compute_roundMultiple<true, true>
 	{
-		template <typename genType>
+		template<typename genType>
 		GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
 		{
 			if(Source >= genType(0))
@@ -176,10 +176,10 @@ namespace detail
 		}
 	};
 
-	template <>
+	template<>
 	struct compute_roundMultiple<false, false>
 	{
-		template <typename genType>
+		template<typename genType>
 		GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
 		{
 			if(Source >= genType(0))
@@ -192,10 +192,10 @@ namespace detail
 		}
 	};
 
-	template <>
+	template<>
 	struct compute_roundMultiple<false, true>
 	{
-		template <typename genType>
+		template<typename genType>
 		GLM_FUNC_QUALIFIER static genType call(genType Source, genType Multiple)
 		{
 			if(Source >= genType(0))
@@ -212,54 +212,54 @@ namespace detail
 	////////////////
 	// isPowerOfTwo
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER bool isPowerOfTwo(genType Value)
 	{
 		genType const Result = glm::abs(Value);
 		return !(Result & (Result - 1));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> isPowerOfTwo(vecType<D, T, P> const & Value)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> isPowerOfTwo(vecType<L, T, P> const & Value)
 	{
-		vecType<D, T, P> const Result(abs(Value));
-		return equal(Result & (Result - 1), vecType<D, T, P>(0));
+		vecType<L, T, P> const Result(abs(Value));
+		return equal(Result & (Result - 1), vecType<L, T, P>(0));
 	}
 
 	//////////////////
 	// ceilPowerOfTwo
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType ceilPowerOfTwo(genType value)
 	{
 		return detail::compute_ceilPowerOfTwo<1, genType, defaultp, vec, std::numeric_limits<genType>::is_signed>::call(vec<1, genType, defaultp>(value)).x;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> ceilPowerOfTwo(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> ceilPowerOfTwo(vecType<L, T, P> const & v)
 	{
-		return detail::compute_ceilPowerOfTwo<D, T, P, vecType, std::numeric_limits<T>::is_signed>::call(v);
+		return detail::compute_ceilPowerOfTwo<L, T, P, vecType, std::numeric_limits<T>::is_signed>::call(v);
 	}
 
 	///////////////////
 	// floorPowerOfTwo
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType floorPowerOfTwo(genType value)
 	{
 		return isPowerOfTwo(value) ? value : static_cast<genType>(1) << findMSB(value);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> floorPowerOfTwo(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> floorPowerOfTwo(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(floorPowerOfTwo, v);
+		return detail::functor1<L, T, T, P>::call(floorPowerOfTwo, v);
 	}
 
 	///////////////////
 	// roundPowerOfTwo
 
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER genIUType roundPowerOfTwo(genIUType value)
 	{
 		if(isPowerOfTwo(value))
@@ -270,75 +270,75 @@ namespace detail
 		return (next - value) < (value - prev) ? next : prev;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> roundPowerOfTwo(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> roundPowerOfTwo(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(roundPowerOfTwo, v);
+		return detail::functor1<L, T, T, P>::call(roundPowerOfTwo, v);
 	}
 
 	////////////////
 	// isMultiple
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER bool isMultiple(genType Value, genType Multiple)
 	{
 		return isMultiple(vec<1, genType>(Value), vec<1, genType>(Multiple)).x;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> isMultiple(vecType<D, T, P> const & Value, T Multiple)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> isMultiple(vecType<L, T, P> const & Value, T Multiple)
 	{
-		return (Value % Multiple) == vecType<D, T, P>(0);
+		return (Value % Multiple) == vecType<L, T, P>(0);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> isMultiple(vecType<D, T, P> const & Value, vecType<D, T, P> const & Multiple)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> isMultiple(vecType<L, T, P> const & Value, vecType<L, T, P> const & Multiple)
 	{
-		return (Value % Multiple) == vecType<D, T, P>(0);
+		return (Value % Multiple) == vecType<L, T, P>(0);
 	}
 
 	//////////////////////
 	// ceilMultiple
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType ceilMultiple(genType Source, genType Multiple)
 	{
 		return detail::compute_ceilMultiple<std::numeric_limits<genType>::is_iec559, std::numeric_limits<genType>::is_signed>::call(Source, Multiple);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> ceilMultiple(vecType<D, T, P> const & Source, vecType<D, T, P> const & Multiple)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> ceilMultiple(vecType<L, T, P> const & Source, vecType<L, T, P> const & Multiple)
 	{
-		return detail::functor2<D, T, P>::call(ceilMultiple, Source, Multiple);
+		return detail::functor2<L, T, P>::call(ceilMultiple, Source, Multiple);
 	}
 
 	//////////////////////
 	// floorMultiple
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType floorMultiple(genType Source, genType Multiple)
 	{
 		return detail::compute_floorMultiple<std::numeric_limits<genType>::is_iec559, std::numeric_limits<genType>::is_signed>::call(Source, Multiple);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> floorMultiple(vecType<D, T, P> const & Source, vecType<D, T, P> const & Multiple)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> floorMultiple(vecType<L, T, P> const & Source, vecType<L, T, P> const & Multiple)
 	{
-		return detail::functor2<D, T, P>::call(floorMultiple, Source, Multiple);
+		return detail::functor2<L, T, P>::call(floorMultiple, Source, Multiple);
 	}
 
 	//////////////////////
 	// roundMultiple
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType roundMultiple(genType Source, genType Multiple)
 	{
 		return detail::compute_roundMultiple<std::numeric_limits<genType>::is_iec559, std::numeric_limits<genType>::is_signed>::call(Source, Multiple);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> roundMultiple(vecType<D, T, P> const & Source, vecType<D, T, P> const & Multiple)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> roundMultiple(vecType<L, T, P> const & Source, vecType<L, T, P> const & Multiple)
 	{
-		return detail::functor2<D, T, P>::call(roundMultiple, Source, Multiple);
+		return detail::functor2<L, T, P>::call(roundMultiple, Source, Multiple);
 	}
 }//namespace glm
diff --git a/glm/gtc/type_ptr.hpp b/glm/gtc/type_ptr.hpp
index 01a2602f..a9b13044 100644
--- a/glm/gtc/type_ptr.hpp
+++ b/glm/gtc/type_ptr.hpp
@@ -60,7 +60,7 @@ namespace glm
 	/// Return the constant address to the data of the input parameter.
 	/// @see gtc_type_ptr
 	template<typename genType>
-	GLM_FUNC_DECL typename genType::value_type const * value_ptr(genType const & vec);
+	GLM_FUNC_DECL typename genType::value_type const * value_ptr(genType const& v);
 
 	/// Build a vector from a pointer.
 	/// @see gtc_type_ptr
diff --git a/glm/gtc/type_ptr.inl b/glm/gtc/type_ptr.inl
index c51c9f70..1b2392cf 100644
--- a/glm/gtc/type_ptr.inl
+++ b/glm/gtc/type_ptr.inl
@@ -11,271 +11,199 @@ namespace glm
 	/// Return the constant address to the data of the vector input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T const * value_ptr
-	(
-		vec<2, T, P> const & vec
-	)
+	GLM_FUNC_QUALIFIER T const* value_ptr(vec<2, T, P> const& v)
 	{
-		return &(vec.x);
+		return &(v.x);
 	}
 
 	//! Return the address to the data of the vector input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T * value_ptr
-	(
-		vec<2, T, P> & vec
-	)
+	GLM_FUNC_QUALIFIER T* value_ptr(vec<2, T, P>& v)
 	{
-		return &(vec.x);
+		return &(v.x);
 	}
 
 	/// Return the constant address to the data of the vector input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T const * value_ptr
-	(
-		vec<3, T, P> const & vec
-	)
+	GLM_FUNC_QUALIFIER T const * value_ptr(vec<3, T, P> const& v)
 	{
-		return &(vec.x);
+		return &(v.x);
 	}
 
 	//! Return the address to the data of the vector input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T * value_ptr
-	(
-		vec<3, T, P> & vec
-	)
+	GLM_FUNC_QUALIFIER T* value_ptr(vec<3, T, P>& v)
 	{
-		return &(vec.x);
+		return &(v.x);
 	}
 		
 	/// Return the constant address to the data of the vector input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T const * value_ptr
-	(	
-		vec<4, T, P> const & vec
-	)
+	GLM_FUNC_QUALIFIER T const* value_ptr(vec<4, T, P> const& v)
 	{
-		return &(vec.x);
+		return &(v.x);
 	}
 
 	//! Return the address to the data of the vector input.
 	//! From GLM_GTC_type_ptr extension.
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T * value_ptr
-	(	
-		vec<4, T, P> & vec
-	)
+	GLM_FUNC_QUALIFIER T* value_ptr(vec<4, T, P>& v)
 	{
-		return &(vec.x);
+		return &(v.x);
 	}
 
 	/// Return the constant address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T const * value_ptr
-	(
-		mat<2, 2, T, P> const& mat
-	)
+	GLM_FUNC_QUALIFIER T const* value_ptr(mat<2, 2, T, P> const& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 
 	//! Return the address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T * value_ptr
-	(
-		mat<2, 2, T, P> & mat
-	)
+	GLM_FUNC_QUALIFIER T* value_ptr(mat<2, 2, T, P>& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
-		
+
 	/// Return the constant address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T const * value_ptr
-	(
-		mat<3, 3, T, P> const& mat
-	)
+	GLM_FUNC_QUALIFIER T const* value_ptr(mat<3, 3, T, P> const& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 
 	//! Return the address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T * value_ptr
-	(
-		mat<3, 3, T, P> & mat
-	)
+	GLM_FUNC_QUALIFIER T* value_ptr(mat<3, 3, T, P>& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 		
 	/// Return the constant address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T const * value_ptr
-	(
-		mat<4, 4, T, P> const& mat
-	)
+	GLM_FUNC_QUALIFIER T const* value_ptr(mat<4, 4, T, P> const& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 
 	//! Return the address to the data of the matrix input.
 	//! From GLM_GTC_type_ptr extension.
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T * value_ptr
-	(
-		mat<4, 4, T, P> & mat
-	)
+	GLM_FUNC_QUALIFIER T* value_ptr(mat<4, 4, T, P>& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 
 	/// Return the constant address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T const * value_ptr
-	(
-		mat<2, 3, T, P> const& mat
-	)
+	GLM_FUNC_QUALIFIER T const* value_ptr(mat<2, 3, T, P> const& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 
 	//! Return the address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T * value_ptr
-	(
-		mat<2, 3, T, P> & mat
-	)
+	GLM_FUNC_QUALIFIER T* value_ptr(mat<2, 3, T, P>& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 		
 	/// Return the constant address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T const * value_ptr
-	(
-		mat<3, 2, T, P> const& mat
-	)
+	GLM_FUNC_QUALIFIER T const* value_ptr(mat<3, 2, T, P> const& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 
 	//! Return the address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T * value_ptr
-	(
-		mat<3, 2, T, P> & mat
-	)
+	GLM_FUNC_QUALIFIER T* value_ptr(mat<3, 2, T, P>& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 		
 	/// Return the constant address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T const * value_ptr
-	(
-		mat<2, 4, T, P> const& mat
-	)
+	GLM_FUNC_QUALIFIER T const* value_ptr(mat<2, 4, T, P> const& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 
 	//! Return the address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T * value_ptr
-	(
-		mat<2, 4, T, P> & mat
-	)
+	GLM_FUNC_QUALIFIER T* value_ptr(mat<2, 4, T, P>& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 		
 	/// Return the constant address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T const * value_ptr
-	(
-		mat<4, 2, T, P> const& mat
-	)
+	GLM_FUNC_QUALIFIER T const* value_ptr(mat<4, 2, T, P> const& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 
 	//! Return the address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T * value_ptr
-	(	
-		mat<4, 2, T, P> & mat
-	)
+	GLM_FUNC_QUALIFIER T* value_ptr(mat<4, 2, T, P>& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 		
 	/// Return the constant address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T const * value_ptr
-	(
-		mat<3, 4, T, P> const& mat
-	)
+	GLM_FUNC_QUALIFIER T const* value_ptr(mat<3, 4, T, P> const& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 
 	//! Return the address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T * value_ptr
-	(
-		mat<3, 4, T, P> & mat
-	)
+	GLM_FUNC_QUALIFIER T* value_ptr(mat<3, 4, T, P>& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 		
 	/// Return the constant address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T const * value_ptr
-	(
-		mat<4, 3, T, P> const& mat
-	)
+	GLM_FUNC_QUALIFIER T const* value_ptr(mat<4, 3, T, P> const& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 
 	/// Return the address to the data of the matrix input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T * value_ptr(mat<4, 3, T, P> & mat)
+	GLM_FUNC_QUALIFIER T * value_ptr(mat<4, 3, T, P>& m)
 	{
-		return &(mat[0].x);
+		return &(m[0].x);
 	}
 
 	/// Return the constant address to the data of the input parameter.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T const * value_ptr
-	(
-		tquat<T, P> const & q
-	)
+	GLM_FUNC_QUALIFIER T const * value_ptr(tquat<T, P> const& q)
 	{
 		return &(q[0]);
 	}
@@ -283,18 +211,15 @@ namespace glm
 	/// Return the address to the data of the quaternion input.
 	/// @see gtc_type_ptr
 	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER T * value_ptr
-	(
-		tquat<T, P> & q
-	)
+	GLM_FUNC_QUALIFIER T* value_ptr(tquat<T, P>& q)
 	{
 		return &(q[0]);
 	}
 
 	/// Build a vector from a pointer.
 	/// @see gtc_type_ptr
-	template <typename T>
-	GLM_FUNC_QUALIFIER vec<2, T, defaultp> make_vec2(T const * const ptr)
+	template<typename T>
+	GLM_FUNC_QUALIFIER vec<2, T, defaultp> make_vec2(T const *const ptr)
 	{
 		vec<2, T, defaultp> Result;
 		memcpy(value_ptr(Result), ptr, sizeof(vec<2, T, defaultp>));
@@ -303,8 +228,8 @@ namespace glm
 
 	/// Build a vector from a pointer.
 	/// @see gtc_type_ptr
-	template <typename T>
-	GLM_FUNC_QUALIFIER vec<3, T, defaultp> make_vec3(T const * const ptr)
+	template<typename T>
+	GLM_FUNC_QUALIFIER vec<3, T, defaultp> make_vec3(T const *const ptr)
 	{
 		vec<3, T, defaultp> Result;
 		memcpy(value_ptr(Result), ptr, sizeof(vec<3, T, defaultp>));
@@ -313,8 +238,8 @@ namespace glm
 
 	/// Build a vector from a pointer.
 	/// @see gtc_type_ptr
-	template <typename T>
-	GLM_FUNC_QUALIFIER vec<4, T, defaultp> make_vec4(T const * const ptr)
+	template<typename T>
+	GLM_FUNC_QUALIFIER vec<4, T, defaultp> make_vec4(T const *const ptr)
 	{
 		vec<4, T, defaultp> Result;
 		memcpy(value_ptr(Result), ptr, sizeof(vec<4, T, defaultp>));
@@ -323,8 +248,8 @@ namespace glm
 
 	/// Build a matrix from a pointer.
 	/// @see gtc_type_ptr
-	template <typename T>
-	GLM_FUNC_QUALIFIER mat<2, 2, T, defaultp> make_mat2x2(T const * const ptr)
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<2, 2, T, defaultp> make_mat2x2(T const *const ptr)
 	{
 		mat<2, 2, T, defaultp> Result;
 		memcpy(value_ptr(Result), ptr, sizeof(mat<2, 2, T, defaultp>));
@@ -333,8 +258,8 @@ namespace glm
 
 	/// Build a matrix from a pointer.
 	/// @see gtc_type_ptr
-	template <typename T>
-	GLM_FUNC_QUALIFIER mat<2, 3, T, defaultp> make_mat2x3(T const * const ptr)
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<2, 3, T, defaultp> make_mat2x3(T const *const ptr)
 	{
 		mat<2, 3, T, defaultp> Result;
 		memcpy(value_ptr(Result), ptr, sizeof(mat<2, 3, T, defaultp>));
@@ -343,8 +268,8 @@ namespace glm
 
 	/// Build a matrix from a pointer.
 	/// @see gtc_type_ptr
-	template <typename T>
-	GLM_FUNC_QUALIFIER mat<2, 4, T, defaultp> make_mat2x4(T const * const ptr)
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<2, 4, T, defaultp> make_mat2x4(T const *const ptr)
 	{
 		mat<2, 4, T, defaultp> Result;
 		memcpy(value_ptr(Result), ptr, sizeof(mat<2, 4, T, defaultp>));
@@ -353,8 +278,8 @@ namespace glm
 
 	/// Build a matrix from a pointer.
 	/// @see gtc_type_ptr
-	template <typename T>
-	GLM_FUNC_QUALIFIER mat<3, 2, T, defaultp> make_mat3x2(T const * const ptr)
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<3, 2, T, defaultp> make_mat3x2(T const *const ptr)
 	{
 		mat<3, 2, T, defaultp> Result;
 		memcpy(value_ptr(Result), ptr, sizeof(mat<3, 2, T, defaultp>));
@@ -363,8 +288,8 @@ namespace glm
 
 	//! Build a matrix from a pointer.
 	/// @see gtc_type_ptr
-	template <typename T>
-	GLM_FUNC_QUALIFIER mat<3, 3, T, defaultp> make_mat3x3(T const * const ptr)
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, defaultp> make_mat3x3(T const *const ptr)
 	{
 		mat<3, 3, T, defaultp> Result;
 		memcpy(value_ptr(Result), ptr, sizeof(mat<3, 3, T, defaultp>));
@@ -373,8 +298,8 @@ namespace glm
 
 	//! Build a matrix from a pointer.
 	/// @see gtc_type_ptr
-	template <typename T>
-	GLM_FUNC_QUALIFIER mat<3, 4, T, defaultp> make_mat3x4(T const * const ptr)
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<3, 4, T, defaultp> make_mat3x4(T const *const ptr)
 	{
 		mat<3, 4, T, defaultp> Result;
 		memcpy(value_ptr(Result), ptr, sizeof(mat<3, 4, T, defaultp>));
@@ -383,8 +308,8 @@ namespace glm
 
 	//! Build a matrix from a pointer.
 	/// @see gtc_type_ptr
-	template <typename T>
-	GLM_FUNC_QUALIFIER mat<4, 2, T, defaultp> make_mat4x2(T const * const ptr)
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<4, 2, T, defaultp> make_mat4x2(T const *const ptr)
 	{
 		mat<4, 2, T, defaultp> Result;
 		memcpy(value_ptr(Result), ptr, sizeof(mat<4, 2, T, defaultp>));
@@ -393,8 +318,8 @@ namespace glm
 
 	//! Build a matrix from a pointer.
 	/// @see gtc_type_ptr
-	template <typename T>
-	GLM_FUNC_QUALIFIER mat<4, 3, T, defaultp> make_mat4x3(T const * const ptr)
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<4, 3, T, defaultp> make_mat4x3(T const *const ptr)
 	{
 		mat<4, 3, T, defaultp> Result;
 		memcpy(value_ptr(Result), ptr, sizeof(mat<4, 3, T, defaultp>));
@@ -403,8 +328,8 @@ namespace glm
 
 	//! Build a matrix from a pointer.
 	/// @see gtc_type_ptr
-	template <typename T>
-	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> make_mat4x4(T const * const ptr)
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> make_mat4x4(T const *const ptr)
 	{
 		mat<4, 4, T, defaultp> Result;
 		memcpy(value_ptr(Result), ptr, sizeof(mat<4, 4, T, defaultp>));
@@ -413,32 +338,32 @@ namespace glm
 
 	//! Build a matrix from a pointer.
 	/// @see gtc_type_ptr
-	template <typename T>
-	GLM_FUNC_QUALIFIER mat<2, 2, T, defaultp> make_mat2(T const * const ptr)
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<2, 2, T, defaultp> make_mat2(T const *const ptr)
 	{
 		return make_mat2x2(ptr);
 	}
 
 	//! Build a matrix from a pointer.
 	/// @see gtc_type_ptr
-	template <typename T>
-	GLM_FUNC_QUALIFIER mat<3, 3, T, defaultp> make_mat3(T const * const ptr)
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, defaultp> make_mat3(T const *const ptr)
 	{
 		return make_mat3x3(ptr);
 	}
 		
 	//! Build a matrix from a pointer.
 	/// @see gtc_type_ptr
-	template <typename T>
-	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> make_mat4(T const * const ptr)
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> make_mat4(T const *const ptr)
 	{
 		return make_mat4x4(ptr);
 	}
 
 	//! Build a quaternion from a pointer.
 	/// @see gtc_type_ptr
-	template <typename T>
-	GLM_FUNC_QUALIFIER tquat<T, defaultp> make_quat(T const * const ptr)
+	template<typename T>
+	GLM_FUNC_QUALIFIER tquat<T, defaultp> make_quat(T const *const ptr)
 	{
 		tquat<T, defaultp> Result;
 		memcpy(value_ptr(Result), ptr, sizeof(tquat<T, defaultp>));
diff --git a/glm/gtc/ulp.hpp b/glm/gtc/ulp.hpp
index 8c590efe..fb07502c 100644
--- a/glm/gtc/ulp.hpp
+++ b/glm/gtc/ulp.hpp
@@ -29,27 +29,27 @@ namespace glm
 
 	/// Return the next ULP value(s) after the input value(s).
 	/// @see gtc_ulp
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType next_float(genType const & x);
 
 	/// Return the previous ULP value(s) before the input value(s).
 	/// @see gtc_ulp
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType prev_float(genType const & x);
 
 	/// Return the value(s) ULP distance after the input value(s).
 	/// @see gtc_ulp
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType next_float(genType const & x, uint const & Distance);
 
 	/// Return the value(s) ULP distance before the input value(s).
 	/// @see gtc_ulp
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType prev_float(genType const & x, uint const & Distance);
 	
 	/// Return the distance in the number of ULP between 2 scalars.
 	/// @see gtc_ulp
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL uint float_distance(T const & x, T const & y);
 
 	/// Return the distance in the number of ULP between 2 vectors.
diff --git a/glm/gtc/ulp.inl b/glm/gtc/ulp.inl
index b413291f..c5fb0cad 100644
--- a/glm/gtc/ulp.inl
+++ b/glm/gtc/ulp.inl
@@ -171,7 +171,7 @@ namespace detail
 
 namespace glm
 {
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER float next_float(float const & x)
 	{
 #		if GLM_HAS_CXX11_STL
@@ -185,7 +185,7 @@ namespace glm
 #		endif
 	}
 
-	template <>
+	template<>
 	GLM_FUNC_QUALIFIER double next_float(double const & x)
 	{
 #		if GLM_HAS_CXX11_STL
@@ -199,10 +199,10 @@ namespace glm
 #		endif
 	}
 
-	template<int D, typename T, precision P, template<int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> next_float(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> next_float(vecType<L, T, P> const & x)
 	{
-		vecType<D, T, P> Result(uninitialize);
+		vecType<L, T, P> Result(uninitialize);
 		for(length_t i = 0, n = Result.length(); i < n; ++i)
 			Result[i] = next_float(x[i]);
 		return Result;
@@ -234,16 +234,16 @@ namespace glm
 #		endif
 	}
 
-	template<int D, typename T, precision P, template<int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> prev_float(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> prev_float(vecType<L, T, P> const & x)
 	{
-		vecType<D, T, P> Result(uninitialize);
+		vecType<L, T, P> Result(uninitialize);
 		for(length_t i = 0, n = Result.length(); i < n; ++i)
 			Result[i] = prev_float(x[i]);
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T next_float(T const & x, uint const & ulps)
 	{
 		T temp = x;
@@ -252,16 +252,16 @@ namespace glm
 		return temp;
 	}
 
-	template<int D, typename T, precision P, template<int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> next_float(vecType<D, T, P> const & x, vecType<D, uint, P> const & ulps)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> next_float(vecType<L, T, P> const & x, vecType<L, uint, P> const & ulps)
 	{
-		vecType<D, T, P> Result(uninitialize);
+		vecType<L, T, P> Result(uninitialize);
 		for(length_t i = 0, n = Result.length(); i < n; ++i)
 			Result[i] = next_float(x[i], ulps[i]);
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T prev_float(T const & x, uint const & ulps)
 	{
 		T temp = x;
@@ -270,16 +270,16 @@ namespace glm
 		return temp;
 	}
 
-	template<int D, typename T, precision P, template<int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> prev_float(vecType<D, T, P> const & x, vecType<D, uint, P> const & ulps)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> prev_float(vecType<L, T, P> const & x, vecType<L, uint, P> const & ulps)
 	{
-		vecType<D, T, P> Result(uninitialize);
+		vecType<L, T, P> Result(uninitialize);
 		for(length_t i = 0, n = Result.length(); i < n; ++i)
 			Result[i] = prev_float(x[i], ulps[i]);
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER uint float_distance(T const & x, T const & y)
 	{
 		uint ulp = 0;
@@ -310,10 +310,10 @@ namespace glm
 		return ulp;
 	}
 
-	template<int D, typename T, precision P, template<int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, uint, P> float_distance(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, uint, P> float_distance(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 	{
-		vecType<D, uint, P> Result(uninitialize);
+		vecType<L, uint, P> Result(uninitialize);
 		for(length_t i = 0, n = Result.length(); i < n; ++i)
 			Result[i] = float_distance(x[i], y[i]);
 		return Result;
diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp
index f43f9dd1..ec66bb7f 100644
--- a/glm/gtx/associated_min_max.hpp
+++ b/glm/gtx/associated_min_max.hpp
@@ -35,24 +35,24 @@ namespace glm
 
 	/// Minimum comparison between 2 variables and returns 2 associated variable values
 	/// @see gtx_associated_min_max
-	template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_DECL vec<2, U, P> associatedMin(
-		vecType<D, T, P> const & x, vecType<D, U, P> const & a,
-		vecType<D, T, P> const & y, vecType<D, U, P> const & b);
+		vecType<L, T, P> const& x, vecType<L, U, P> const & a,
+		vecType<L, T, P> const& y, vecType<L, U, P> const & b);
 
 	/// Minimum comparison between 2 variables and returns 2 associated variable values
 	/// @see gtx_associated_min_max
-	template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, U, P> associatedMin(
-		T x, const vecType<D, U, P>& a,
-		T y, const vecType<D, U, P>& b);
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, U, P> associatedMin(
+		T x, const vecType<L, U, P>& a,
+		T y, const vecType<L, U, P>& b);
 
 	/// Minimum comparison between 2 variables and returns 2 associated variable values
 	/// @see gtx_associated_min_max
-	template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, U, P> associatedMin(
-		vecType<D, T, P> const & x, U a,
-		vecType<D, T, P> const & y, U b);
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, U, P> associatedMin(
+		vecType<L, T, P> const& x, U a,
+		vecType<L, T, P> const& y, U b);
 
 	/// Minimum comparison between 3 variables and returns 3 associated variable values
 	/// @see gtx_associated_min_max
@@ -64,11 +64,11 @@ namespace glm
 
 	/// Minimum comparison between 3 variables and returns 3 associated variable values
 	/// @see gtx_associated_min_max
-	template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, U, P> associatedMin(
-		vecType<D, T, P> const & x, vecType<D, U, P> const & a,
-		vecType<D, T, P> const & y, vecType<D, U, P> const & b,
-		vecType<D, T, P> const & z, vecType<D, U, P> const & c);
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, U, P> associatedMin(
+		vecType<L, T, P> const& x, vecType<L, U, P> const & a,
+		vecType<L, T, P> const& y, vecType<L, U, P> const & b,
+		vecType<L, T, P> const& z, vecType<L, U, P> const & c);
 
 	/// Minimum comparison between 4 variables and returns 4 associated variable values
 	/// @see gtx_associated_min_max
@@ -81,30 +81,30 @@ namespace glm
 
 	/// Minimum comparison between 4 variables and returns 4 associated variable values
 	/// @see gtx_associated_min_max
-	template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, U, P> associatedMin(
-		vecType<D, T, P> const & x, vecType<D, U, P> const & a,
-		vecType<D, T, P> const & y, vecType<D, U, P> const & b,
-		vecType<D, T, P> const & z, vecType<D, U, P> const & c,
-		vecType<D, T, P> const & w, vecType<D, U, P> const & d);
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, U, P> associatedMin(
+		vecType<L, T, P> const& x, vecType<L, U, P> const & a,
+		vecType<L, T, P> const& y, vecType<L, U, P> const & b,
+		vecType<L, T, P> const& z, vecType<L, U, P> const & c,
+		vecType<L, T, P> const& w, vecType<L, U, P> const & d);
 
 	/// Minimum comparison between 4 variables and returns 4 associated variable values
 	/// @see gtx_associated_min_max
-	template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, U, P> associatedMin(
-		T x, vecType<D, U, P> const & a,
-		T y, vecType<D, U, P> const & b,
-		T z, vecType<D, U, P> const & c,
-		T w, vecType<D, U, P> const & d);
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, U, P> associatedMin(
+		T x, vecType<L, U, P> const & a,
+		T y, vecType<L, U, P> const & b,
+		T z, vecType<L, U, P> const & c,
+		T w, vecType<L, U, P> const & d);
 
 	/// Minimum comparison between 4 variables and returns 4 associated variable values
 	/// @see gtx_associated_min_max
-	template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, U, P> associatedMin(
-		vecType<D, T, P> const & x, U a,
-		vecType<D, T, P> const & y, U b,
-		vecType<D, T, P> const & z, U c,
-		vecType<D, T, P> const & w, U d);
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, U, P> associatedMin(
+		vecType<L, T, P> const& x, U a,
+		vecType<L, T, P> const& y, U b,
+		vecType<L, T, P> const& z, U c,
+		vecType<L, T, P> const& w, U d);
 
 	/// Maximum comparison between 2 variables and returns 2 associated variable values
 	/// @see gtx_associated_min_max
@@ -113,24 +113,24 @@ namespace glm
 
 	/// Maximum comparison between 2 variables and returns 2 associated variable values
 	/// @see gtx_associated_min_max
-	template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_DECL vec<2, U, P> associatedMax(
-		vecType<D, T, P> const & x, vecType<D, U, P> const & a,
-		vecType<D, T, P> const & y, vecType<D, U, P> const & b);
+		vecType<L, T, P> const& x, vecType<L, U, P> const & a,
+		vecType<L, T, P> const& y, vecType<L, U, P> const & b);
 
 	/// Maximum comparison between 2 variables and returns 2 associated variable values
 	/// @see gtx_associated_min_max
-	template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> associatedMax(
-		T x, vecType<D, U, P> const & a,
-		T y, vecType<D, U, P> const & b);
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> associatedMax(
+		T x, vecType<L, U, P> const & a,
+		T y, vecType<L, U, P> const & b);
 
 	/// Maximum comparison between 2 variables and returns 2 associated variable values
 	/// @see gtx_associated_min_max
-	template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, U, P> associatedMax(
-		vecType<D, T, P> const & x, U a,
-		vecType<D, T, P> const & y, U b);
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, U, P> associatedMax(
+		vecType<L, T, P> const& x, U a,
+		vecType<L, T, P> const& y, U b);
 
 	/// Maximum comparison between 3 variables and returns 3 associated variable values
 	/// @see gtx_associated_min_max
@@ -142,27 +142,27 @@ namespace glm
 
 	/// Maximum comparison between 3 variables and returns 3 associated variable values
 	/// @see gtx_associated_min_max
-	template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, U, P> associatedMax(
-		vecType<D, T, P> const & x, vecType<D, U, P> const & a,
-		vecType<D, T, P> const & y, vecType<D, U, P> const & b,
-		vecType<D, T, P> const & z, vecType<D, U, P> const & c);
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, U, P> associatedMax(
+		vecType<L, T, P> const& x, vecType<L, U, P> const & a,
+		vecType<L, T, P> const& y, vecType<L, U, P> const & b,
+		vecType<L, T, P> const& z, vecType<L, U, P> const & c);
 
 	/// Maximum comparison between 3 variables and returns 3 associated variable values
 	/// @see gtx_associated_min_max
-	template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> associatedMax(
-		T x, vecType<D, U, P> const & a,
-		T y, vecType<D, U, P> const & b,
-		T z, vecType<D, U, P> const & c);
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> associatedMax(
+		T x, vecType<L, U, P> const & a,
+		T y, vecType<L, U, P> const & b,
+		T z, vecType<L, U, P> const & c);
 
 	/// Maximum comparison between 3 variables and returns 3 associated variable values
 	/// @see gtx_associated_min_max
-	template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, U, P> associatedMax(
-		vecType<D, T, P> const & x, U a,
-		vecType<D, T, P> const & y, U b,
-		vecType<D, T, P> const & z, U c);
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, U, P> associatedMax(
+		vecType<L, T, P> const& x, U a,
+		vecType<L, T, P> const& y, U b,
+		vecType<L, T, P> const& z, U c);
 
 	/// Maximum comparison between 4 variables and returns 4 associated variable values
 	/// @see gtx_associated_min_max
@@ -175,30 +175,30 @@ namespace glm
 
 	/// Maximum comparison between 4 variables and returns 4 associated variable values
 	/// @see gtx_associated_min_max
-	template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, U, P> associatedMax(
-		vecType<D, T, P> const & x, vecType<D, U, P> const & a,
-		vecType<D, T, P> const & y, vecType<D, U, P> const & b,
-		vecType<D, T, P> const & z, vecType<D, U, P> const & c,
-		vecType<D, T, P> const & w, vecType<D, U, P> const & d);
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, U, P> associatedMax(
+		vecType<L, T, P> const& x, vecType<L, U, P> const & a,
+		vecType<L, T, P> const& y, vecType<L, U, P> const & b,
+		vecType<L, T, P> const& z, vecType<L, U, P> const & c,
+		vecType<L, T, P> const& w, vecType<L, U, P> const & d);
 
 	/// Maximum comparison between 4 variables and returns 4 associated variable values
 	/// @see gtx_associated_min_max
-	template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, U, P> associatedMax(
-		T x, vecType<D, U, P> const & a,
-		T y, vecType<D, U, P> const & b,
-		T z, vecType<D, U, P> const & c,
-		T w, vecType<D, U, P> const & d);
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, U, P> associatedMax(
+		T x, vecType<L, U, P> const & a,
+		T y, vecType<L, U, P> const & b,
+		T z, vecType<L, U, P> const & c,
+		T w, vecType<L, U, P> const & d);
 
 	/// Maximum comparison between 4 variables and returns 4 associated variable values
 	/// @see gtx_associated_min_max
-	template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, U, P> associatedMax(
-		vecType<D, T, P> const & x, U a,
-		vecType<D, T, P> const & y, U b,
-		vecType<D, T, P> const & z, U c,
-		vecType<D, T, P> const & w, U d);
+	template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, U, P> associatedMax(
+		vecType<L, T, P> const& x, U a,
+		vecType<L, T, P> const& y, U b,
+		vecType<L, T, P> const& z, U c,
+		vecType<L, T, P> const& w, U d);
 
 	/// @}
 } //namespace glm
diff --git a/glm/gtx/associated_min_max.inl b/glm/gtx/associated_min_max.inl
index 70a1105c..23a7fffd 100644
--- a/glm/gtx/associated_min_max.inl
+++ b/glm/gtx/associated_min_max.inl
@@ -10,40 +10,40 @@ GLM_FUNC_QUALIFIER U associatedMin(T x, U a, T y, U b)
 	return x < y ? a : b;
 }
 
-template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
+template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
 GLM_FUNC_QUALIFIER vec<2, U, P> associatedMin
 (
-	vecType<D, T, P> const & x, vecType<D, U, P> const & a,
-	vecType<D, T, P> const & y, vecType<D, U, P> const & b
+	vecType<L, T, P> const& x, vecType<L, U, P> const & a,
+	vecType<L, T, P> const& y, vecType<L, U, P> const & b
 )
 {
-	vecType<D, U, P> Result(uninitialize);
+	vecType<L, U, P> Result(uninitialize);
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x[i] < y[i] ? a[i] : b[i];
 	return Result;
 }
 
-template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<D, U, P> associatedMin
+template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+GLM_FUNC_QUALIFIER vecType<L, U, P> associatedMin
 (
-	T x, const vecType<D, U, P>& a,
-	T y, const vecType<D, U, P>& b
+	T x, const vecType<L, U, P>& a,
+	T y, const vecType<L, U, P>& b
 )
 {
-	vecType<D, U, P> Result(uninitialize);
+	vecType<L, U, P> Result(uninitialize);
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x < y ? a[i] : b[i];
 	return Result;
 }
 
-template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<D, U, P> associatedMin
+template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+GLM_FUNC_QUALIFIER vecType<L, U, P> associatedMin
 (
-	vecType<D, T, P> const & x, U a,
-	vecType<D, T, P> const & y, U b
+	vecType<L, T, P> const& x, U a,
+	vecType<L, T, P> const& y, U b
 )
 {
-	vecType<D, U, P> Result(uninitialize);
+	vecType<L, U, P> Result(uninitialize);
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x[i] < y[i] ? a : b;
 	return Result;
@@ -62,15 +62,15 @@ GLM_FUNC_QUALIFIER U associatedMin
 	return Result;
 }
 
-template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<D, U, P> associatedMin
+template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+GLM_FUNC_QUALIFIER vecType<L, U, P> associatedMin
 (
-	vecType<D, T, P> const & x, vecType<D, U, P> const & a,
-	vecType<D, T, P> const & y, vecType<D, U, P> const & b,
-	vecType<D, T, P> const & z, vecType<D, U, P> const & c
+	vecType<L, T, P> const& x, vecType<L, U, P> const & a,
+	vecType<L, T, P> const& y, vecType<L, U, P> const & b,
+	vecType<L, T, P> const& z, vecType<L, U, P> const & c
 )
 {
-	vecType<D, U, P> Result(uninitialize);
+	vecType<L, U, P> Result(uninitialize);
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x[i] < y[i] ? (x[i] < z[i] ? a[i] : c[i]) : (y[i] < z[i] ? b[i] : c[i]);
 	return Result;
@@ -95,16 +95,16 @@ GLM_FUNC_QUALIFIER U associatedMin
 }
 
 // Min comparison between 4 variables
-template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<D, U, P> associatedMin
+template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+GLM_FUNC_QUALIFIER vecType<L, U, P> associatedMin
 (
-	vecType<D, T, P> const & x, vecType<D, U, P> const & a,
-	vecType<D, T, P> const & y, vecType<D, U, P> const & b,
-	vecType<D, T, P> const & z, vecType<D, U, P> const & c,
-	vecType<D, T, P> const & w, vecType<D, U, P> const & d
+	vecType<L, T, P> const& x, vecType<L, U, P> const & a,
+	vecType<L, T, P> const& y, vecType<L, U, P> const & b,
+	vecType<L, T, P> const& z, vecType<L, U, P> const & c,
+	vecType<L, T, P> const& w, vecType<L, U, P> const & d
 )
 {
-	vecType<D, U, P> Result(uninitialize);
+	vecType<L, U, P> Result(uninitialize);
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 	{
 		T Test1 = min(x[i], y[i]);
@@ -117,19 +117,19 @@ GLM_FUNC_QUALIFIER vecType<D, U, P> associatedMin
 }
 
 // Min comparison between 4 variables
-template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<D, U, P> associatedMin
+template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+GLM_FUNC_QUALIFIER vecType<L, U, P> associatedMin
 (
-	T x, vecType<D, U, P> const & a,
-	T y, vecType<D, U, P> const & b,
-	T z, vecType<D, U, P> const & c,
-	T w, vecType<D, U, P> const & d
+	T x, vecType<L, U, P> const & a,
+	T y, vecType<L, U, P> const & b,
+	T z, vecType<L, U, P> const & c,
+	T w, vecType<L, U, P> const & d
 )
 {
 	T Test1 = min(x, y);
 	T Test2 = min(z, w);
 
-	vecType<D, U, P> Result(uninitialize);
+	vecType<L, U, P> Result(uninitialize);
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 	{
 		U Result1 = x < y ? a[i] : b[i];
@@ -140,16 +140,16 @@ GLM_FUNC_QUALIFIER vecType<D, U, P> associatedMin
 }
 
 // Min comparison between 4 variables
-template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<D, U, P> associatedMin
+template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+GLM_FUNC_QUALIFIER vecType<L, U, P> associatedMin
 (
-	vecType<D, T, P> const & x, U a,
-	vecType<D, T, P> const & y, U b,
-	vecType<D, T, P> const & z, U c,
-	vecType<D, T, P> const & w, U d
+	vecType<L, T, P> const& x, U a,
+	vecType<L, T, P> const& y, U b,
+	vecType<L, T, P> const& z, U c,
+	vecType<L, T, P> const& w, U d
 )
 {
-	vecType<D, U, P> Result(uninitialize);
+	vecType<L, U, P> Result(uninitialize);
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 	{
 		T Test1 = min(x[i], y[i]);
@@ -169,42 +169,42 @@ GLM_FUNC_QUALIFIER U associatedMax(T x, U a, T y, U b)
 }
 
 // Max comparison between 2 variables
-template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
+template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
 GLM_FUNC_QUALIFIER vec<2, U, P> associatedMax
 (
-	vecType<D, T, P> const & x, vecType<D, U, P> const & a,
-	vecType<D, T, P> const & y, vecType<D, U, P> const & b
+	vecType<L, T, P> const& x, vecType<L, U, P> const & a,
+	vecType<L, T, P> const& y, vecType<L, U, P> const & b
 )
 {
-	vecType<D, U, P> Result(uninitialize);
+	vecType<L, U, P> Result(uninitialize);
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x[i] > y[i] ? a[i] : b[i];
 	return Result;
 }
 
 // Max comparison between 2 variables
-template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<D, T, P> associatedMax
+template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+GLM_FUNC_QUALIFIER vecType<L, T, P> associatedMax
 (
-	T x, vecType<D, U, P> const & a,
-	T y, vecType<D, U, P> const & b
+	T x, vecType<L, U, P> const & a,
+	T y, vecType<L, U, P> const & b
 )
 {
-	vecType<D, U, P> Result(uninitialize);
+	vecType<L, U, P> Result(uninitialize);
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x > y ? a[i] : b[i];
 	return Result;
 }
 
 // Max comparison between 2 variables
-template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<D, U, P> associatedMax
+template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+GLM_FUNC_QUALIFIER vecType<L, U, P> associatedMax
 (
-	vecType<D, T, P> const & x, U a,
-	vecType<D, T, P> const & y, U b
+	vecType<L, T, P> const& x, U a,
+	vecType<L, T, P> const& y, U b
 )
 {
-	vecType<D, T, P> Result(uninitialize);
+	vecType<L, T, P> Result(uninitialize);
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x[i] > y[i] ? a : b;
 	return Result;
@@ -224,45 +224,45 @@ GLM_FUNC_QUALIFIER U associatedMax
 }
 
 // Max comparison between 3 variables
-template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<D, U, P> associatedMax
+template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+GLM_FUNC_QUALIFIER vecType<L, U, P> associatedMax
 (
-	vecType<D, T, P> const & x, vecType<D, U, P> const & a,
-	vecType<D, T, P> const & y, vecType<D, U, P> const & b,
-	vecType<D, T, P> const & z, vecType<D, U, P> const & c
+	vecType<L, T, P> const& x, vecType<L, U, P> const & a,
+	vecType<L, T, P> const& y, vecType<L, U, P> const & b,
+	vecType<L, T, P> const& z, vecType<L, U, P> const & c
 )
 {
-	vecType<D, U, P> Result(uninitialize);
+	vecType<L, U, P> Result(uninitialize);
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x[i] > y[i] ? (x[i] > z[i] ? a[i] : c[i]) : (y[i] > z[i] ? b[i] : c[i]);
 	return Result;
 }
 
 // Max comparison between 3 variables
-template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<D, T, P> associatedMax
+template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+GLM_FUNC_QUALIFIER vecType<L, T, P> associatedMax
 (
-	T x, vecType<D, U, P> const & a,
-	T y, vecType<D, U, P> const & b,
-	T z, vecType<D, U, P> const & c
+	T x, vecType<L, U, P> const & a,
+	T y, vecType<L, U, P> const & b,
+	T z, vecType<L, U, P> const & c
 )
 {
-	vecType<D, U, P> Result(uninitialize);
+	vecType<L, U, P> Result(uninitialize);
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x > y ? (x > z ? a[i] : c[i]) : (y > z ? b[i] : c[i]);
 	return Result;
 }
 
 // Max comparison between 3 variables
-template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<D, U, P> associatedMax
+template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+GLM_FUNC_QUALIFIER vecType<L, U, P> associatedMax
 (
-	vecType<D, T, P> const & x, U a,
-	vecType<D, T, P> const & y, U b,
-	vecType<D, T, P> const & z, U c
+	vecType<L, T, P> const& x, U a,
+	vecType<L, T, P> const& y, U b,
+	vecType<L, T, P> const& z, U c
 )
 {
-	vecType<D, T, P> Result(uninitialize);
+	vecType<L, T, P> Result(uninitialize);
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x[i] > y[i] ? (x[i] > z[i] ? a : c) : (y[i] > z[i] ? b : c);
 	return Result;
@@ -287,16 +287,16 @@ GLM_FUNC_QUALIFIER U associatedMax
 }
 
 // Max comparison between 4 variables
-template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<D, U, P> associatedMax
+template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+GLM_FUNC_QUALIFIER vecType<L, U, P> associatedMax
 (
-	vecType<D, T, P> const & x, vecType<D, U, P> const & a,
-	vecType<D, T, P> const & y, vecType<D, U, P> const & b,
-	vecType<D, T, P> const & z, vecType<D, U, P> const & c,
-	vecType<D, T, P> const & w, vecType<D, U, P> const & d
+	vecType<L, T, P> const& x, vecType<L, U, P> const & a,
+	vecType<L, T, P> const& y, vecType<L, U, P> const & b,
+	vecType<L, T, P> const& z, vecType<L, U, P> const & c,
+	vecType<L, T, P> const& w, vecType<L, U, P> const & d
 )
 {
-	vecType<D, U, P> Result(uninitialize);
+	vecType<L, U, P> Result(uninitialize);
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 	{
 		T Test1 = max(x[i], y[i]);
@@ -309,19 +309,19 @@ GLM_FUNC_QUALIFIER vecType<D, U, P> associatedMax
 }
 
 // Max comparison between 4 variables
-template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<D, U, P> associatedMax
+template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+GLM_FUNC_QUALIFIER vecType<L, U, P> associatedMax
 (
-	T x, vecType<D, U, P> const & a,
-	T y, vecType<D, U, P> const & b,
-	T z, vecType<D, U, P> const & c,
-	T w, vecType<D, U, P> const & d
+	T x, vecType<L, U, P> const & a,
+	T y, vecType<L, U, P> const & b,
+	T z, vecType<L, U, P> const & c,
+	T w, vecType<L, U, P> const & d
 )
 {
 	T Test1 = max(x, y);
 	T Test2 = max(z, w);
 
-	vecType<D, U, P> Result(uninitialize);
+	vecType<L, U, P> Result(uninitialize);
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 	{
 		U Result1 = x > y ? a[i] : b[i];
@@ -332,16 +332,16 @@ GLM_FUNC_QUALIFIER vecType<D, U, P> associatedMax
 }
 
 // Max comparison between 4 variables
-template<int D, typename T, typename U, precision P, template <int, typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<D, U, P> associatedMax
+template<length_t L, typename T, typename U, precision P, template<length_t, typename, precision> class vecType>
+GLM_FUNC_QUALIFIER vecType<L, U, P> associatedMax
 (
-	vecType<D, T, P> const & x, U a,
-	vecType<D, T, P> const & y, U b,
-	vecType<D, T, P> const & z, U c,
-	vecType<D, T, P> const & w, U d
+	vecType<L, T, P> const& x, U a,
+	vecType<L, T, P> const& y, U b,
+	vecType<L, T, P> const& z, U c,
+	vecType<L, T, P> const& w, U d
 )
 {
-	vecType<D, U, P> Result(uninitialize);
+	vecType<L, U, P> Result(uninitialize);
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 	{
 		T Test1 = max(x[i], y[i]);
diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp
index 641b0554..15bfe5d6 100644
--- a/glm/gtx/bit.hpp
+++ b/glm/gtx/bit.hpp
@@ -29,25 +29,25 @@ namespace glm
 	/// @{
 
 	/// @see gtx_bit
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL genIUType highestBitValue(genIUType Value);
 
 	/// @see gtx_bit
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL genIUType lowestBitValue(genIUType Value);
 
 	/// Find the highest bit set to 1 in a integer variable and return its value.
 	///
 	/// @see gtx_bit
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> highestBitValue(vecType<D, T, P> const & value);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> highestBitValue(vecType<L, T, P> const & value);
 
 	/// Return the power of two number which value is just higher the input value.
 	/// Deprecated, use ceilPowerOfTwo from GTC_round instead
 	///
 	/// @see gtc_round
 	/// @see gtx_bit
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_DEPRECATED GLM_FUNC_DECL genIUType powerOfTwoAbove(genIUType Value);
 
 	/// Return the power of two number which value is just higher the input value.
@@ -55,15 +55,15 @@ namespace glm
 	///
 	/// @see gtc_round
 	/// @see gtx_bit
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_DEPRECATED GLM_FUNC_DECL vecType<D, T, P> powerOfTwoAbove(vecType<D, T, P> const & value);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_DEPRECATED GLM_FUNC_DECL vecType<L, T, P> powerOfTwoAbove(vecType<L, T, P> const & value);
 
 	/// Return the power of two number which value is just lower the input value.
 	/// Deprecated, use floorPowerOfTwo from GTC_round instead
 	///
 	/// @see gtc_round
 	/// @see gtx_bit
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_DEPRECATED GLM_FUNC_DECL genIUType powerOfTwoBelow(genIUType Value);
 
 	/// Return the power of two number which value is just lower the input value.
@@ -71,15 +71,15 @@ namespace glm
 	///
 	/// @see gtc_round
 	/// @see gtx_bit
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_DEPRECATED GLM_FUNC_DECL vecType<D, T, P> powerOfTwoBelow(vecType<D, T, P> const & value);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_DEPRECATED GLM_FUNC_DECL vecType<L, T, P> powerOfTwoBelow(vecType<L, T, P> const & value);
 
 	/// Return the power of two number which value is the closet to the input value.
 	/// Deprecated, use roundPowerOfTwo from GTC_round instead
 	///
 	/// @see gtc_round
 	/// @see gtx_bit
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_DEPRECATED GLM_FUNC_DECL genIUType powerOfTwoNearest(genIUType Value);
 
 	/// Return the power of two number which value is the closet to the input value.
@@ -87,8 +87,8 @@ namespace glm
 	///
 	/// @see gtc_round
 	/// @see gtx_bit
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_DEPRECATED GLM_FUNC_DECL vecType<D, T, P> powerOfTwoNearest(vecType<D, T, P> const & value);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_DEPRECATED GLM_FUNC_DECL vecType<L, T, P> powerOfTwoNearest(vecType<L, T, P> const & value);
 
 	/// @}
 } //namespace glm
diff --git a/glm/gtx/bit.inl b/glm/gtx/bit.inl
index 65a109ac..ff7530c4 100644
--- a/glm/gtx/bit.inl
+++ b/glm/gtx/bit.inl
@@ -6,7 +6,7 @@ namespace glm
 	///////////////////
 	// highestBitValue
 
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER genIUType highestBitValue(genIUType Value)
 	{
 		genIUType tmp = Value;
@@ -19,61 +19,61 @@ namespace glm
 		return result;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> highestBitValue(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> highestBitValue(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(highestBitValue, v);
+		return detail::functor1<L, T, T, P>::call(highestBitValue, v);
 	}
 
 	///////////////////
 	// lowestBitValue
 
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER genIUType lowestBitValue(genIUType Value)
 	{
 		return (Value & (~Value + 1));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> lowestBitValue(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> lowestBitValue(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(lowestBitValue, v);
+		return detail::functor1<L, T, T, P>::call(lowestBitValue, v);
 	}
 
 	///////////////////
 	// powerOfTwoAbove
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType powerOfTwoAbove(genType value)
 	{
 		return isPowerOfTwo(value) ? value : highestBitValue(value) << 1;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> powerOfTwoAbove(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> powerOfTwoAbove(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(powerOfTwoAbove, v);
+		return detail::functor1<L, T, T, P>::call(powerOfTwoAbove, v);
 	}
 
 	///////////////////
 	// powerOfTwoBelow
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType powerOfTwoBelow(genType value)
 	{
 		return isPowerOfTwo(value) ? value : highestBitValue(value);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> powerOfTwoBelow(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> powerOfTwoBelow(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(powerOfTwoBelow, v);
+		return detail::functor1<L, T, T, P>::call(powerOfTwoBelow, v);
 	}
 
 	/////////////////////
 	// powerOfTwoNearest
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType powerOfTwoNearest(genType value)
 	{
 		if(isPowerOfTwo(value))
@@ -84,10 +84,10 @@ namespace glm
 		return (next - value) < (value - prev) ? next : prev;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> powerOfTwoNearest(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> powerOfTwoNearest(vecType<L, T, P> const & v)
 	{
-		return detail::functor1<D, T, T, P>::call(powerOfTwoNearest, v);
+		return detail::functor1<L, T, T, P>::call(powerOfTwoNearest, v);
 	}
 
 }//namespace glm
diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp
index ff8414c0..a8433360 100644
--- a/glm/gtx/closest_point.hpp
+++ b/glm/gtx/closest_point.hpp
@@ -30,14 +30,14 @@ namespace glm
 
 	/// Find the point on a straight line which is the closet of a point. 
 	/// @see gtx_closest_point
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> closestPointOnLine(
 		vec<3, T, P> const & point,
 		vec<3, T, P> const & a, 
 		vec<3, T, P> const & b);
 	
 	/// 2d lines work as well	
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> closestPointOnLine(
 		vec<2, T, P> const & point,
 		vec<2, T, P> const & a, 
diff --git a/glm/gtx/closest_point.inl b/glm/gtx/closest_point.inl
index 619d987d..fdbc9373 100644
--- a/glm/gtx/closest_point.inl
+++ b/glm/gtx/closest_point.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> closestPointOnLine
 	(
 		vec<3, T, P> const & point,
@@ -23,7 +23,7 @@ namespace glm
 		return a + LineDirection * Distance;
 	}
 	
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> closestPointOnLine
 	(
 		vec<2, T, P> const & point,
diff --git a/glm/gtx/color_encoding.hpp b/glm/gtx/color_encoding.hpp
index f4150856..0994e283 100644
--- a/glm/gtx/color_encoding.hpp
+++ b/glm/gtx/color_encoding.hpp
@@ -29,19 +29,19 @@ namespace glm
 	/// @{
 
 	/// Convert a linear sRGB color to D65 YUV.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> convertLinearSRGBToD65XYZ(vec<3, T, P> const& ColorLinearSRGB);
 
 	/// Convert a linear sRGB color to D50 YUV.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> convertLinearSRGBToD50XYZ(vec<3, T, P> const& ColorLinearSRGB);
 
 	/// Convert a D65 YUV color to linear sRGB.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> convertD65XYZToLinearSRGB(vec<3, T, P> const& ColorD65XYZ);
 
 	/// Convert a D65 YUV color to D50 YUV.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> convertD65XYZToD50XYZ(vec<3, T, P> const& ColorD65XYZ);
 
 	/// @}
diff --git a/glm/gtx/color_encoding.inl b/glm/gtx/color_encoding.inl
index 497f25be..ad82dc52 100644
--- a/glm/gtx/color_encoding.inl
+++ b/glm/gtx/color_encoding.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> convertLinearSRGBToD65XYZ(vec<3, T, P> const& ColorLinearSRGB)
 	{
 		vec<3, T, P> const M(0.490f, 0.17697f, 0.2f);
@@ -13,7 +13,7 @@ namespace glm
 		return (M * ColorLinearSRGB + N * ColorLinearSRGB + O * ColorLinearSRGB) * static_cast<T>(5.650675255693055f);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> convertLinearSRGBToD50XYZ(vec<3, T, P> const& ColorLinearSRGB)
 	{
 		vec<3, T, P> const M(0.436030342570117f, 0.222438466210245f, 0.013897440074263f);
@@ -23,7 +23,7 @@ namespace glm
 		return M * ColorLinearSRGB + N * ColorLinearSRGB + O * ColorLinearSRGB;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> convertD65XYZToLinearSRGB(vec<3, T, P> const& ColorD65XYZ)
 	{
 		vec<3, T, P> const M(0.41847f, -0.091169f, 0.0009209f);
@@ -33,7 +33,7 @@ namespace glm
 		return M * ColorD65XYZ + N * ColorD65XYZ + O * ColorD65XYZ;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> convertD65XYZToD50XYZ(vec<3, T, P> const& ColorD65XYZ)
 	{
 		vec<3, T, P> const M(+1.047844353856414f, +0.029549007606644f, -0.009250984365223f);
diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp
index 6db6de02..04ff13e6 100644
--- a/glm/gtx/color_space.hpp
+++ b/glm/gtx/color_space.hpp
@@ -30,39 +30,39 @@ namespace glm
 
 	/// Converts a color from HSV color space to its color in RGB color space.
 	/// @see gtx_color_space
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> rgbColor(
 		vec<3, T, P> const & hsvValue);
 
 	/// Converts a color from RGB color space to its color in HSV color space.
 	/// @see gtx_color_space
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> hsvColor(
 		vec<3, T, P> const & rgbValue);
 		
 	/// Build a saturation matrix.
 	/// @see gtx_color_space
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> saturation(
 		T const s);
 
 	/// Modify the saturation of a color.
 	/// @see gtx_color_space
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> saturation(
 		T const s,
 		vec<3, T, P> const & color);
 		
 	/// Modify the saturation of a color.
 	/// @see gtx_color_space
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> saturation(
 		T const s,
 		vec<4, T, P> const & color);
 		
 	/// Compute color luminosity associating ratios (0.33, 0.59, 0.11) to RGB canals.
 	/// @see gtx_color_space
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T luminosity(
 		vec<3, T, P> const & color);
 
diff --git a/glm/gtx/color_space.inl b/glm/gtx/color_space.inl
index 0aba220b..9f5572bf 100644
--- a/glm/gtx/color_space.inl
+++ b/glm/gtx/color_space.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> rgbColor(const vec<3, T, P>& hsvColor)
 	{
 		vec<3, T, P> hsv = hsvColor;
@@ -60,7 +60,7 @@ namespace glm
 		return rgbColor;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> hsvColor(const vec<3, T, P>& rgbColor)
 	{
 		vec<3, T, P> hsv = rgbColor;
@@ -100,7 +100,7 @@ namespace glm
 		return hsv;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> saturation(T const s)
 	{
 		vec<3, T, defaultp> rgbw = vec<3, T, defaultp>(T(0.2126), T(0.7152), T(0.0722));
@@ -122,19 +122,19 @@ namespace glm
 		return result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> saturation(const T s, const vec<3, T, P>& color)
 	{
 		return vec<3, T, P>(saturation(s) * vec<4, T, P>(color, T(0)));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> saturation(const T s, const vec<4, T, P>& color)
 	{
 		return saturation(s) * color;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER T luminosity(const vec<3, T, P>& color)
 	{
 		const vec<3, T, P> tmp = vec<3, T, P>(0.33, 0.59, 0.11);
diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp
index 0e418696..0ac1dc36 100644
--- a/glm/gtx/color_space_YCoCg.hpp
+++ b/glm/gtx/color_space_YCoCg.hpp
@@ -30,27 +30,27 @@ namespace glm
 
 	/// Convert a color from RGB color space to YCoCg color space.
 	/// @see gtx_color_space_YCoCg
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> rgb2YCoCg(
 		vec<3, T, P> const & rgbColor);
 
 	/// Convert a color from YCoCg color space to RGB color space.
 	/// @see gtx_color_space_YCoCg
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> YCoCg2rgb(
 		vec<3, T, P> const & YCoCgColor);
 
 	/// Convert a color from RGB color space to YCoCgR color space.
 	/// @see "YCoCg-R: A Color Space with RGB Reversibility and Low Dynamic Range"
 	/// @see gtx_color_space_YCoCg
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> rgb2YCoCgR(
 		vec<3, T, P> const & rgbColor);
 
 	/// Convert a color from YCoCgR color space to RGB color space.
 	/// @see "YCoCg-R: A Color Space with RGB Reversibility and Low Dynamic Range"
 	/// @see gtx_color_space_YCoCg
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> YCoCgR2rgb(
 		vec<3, T, P> const & YCoCgColor);
 
diff --git a/glm/gtx/color_space_YCoCg.inl b/glm/gtx/color_space_YCoCg.inl
index ec759bfe..62b04417 100644
--- a/glm/gtx/color_space_YCoCg.inl
+++ b/glm/gtx/color_space_YCoCg.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> rgb2YCoCg
 	(
 		vec<3, T, P> const & rgbColor
@@ -16,7 +16,7 @@ namespace glm
 		return result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> YCoCg2rgb
 	(
 		vec<3, T, P> const & YCoCgColor
@@ -29,7 +29,7 @@ namespace glm
 		return result;
 	}
 
-	template <typename T, precision P, bool isInteger>
+	template<typename T, precision P, bool isInteger>
 	class compute_YCoCgR {
 	public:
 		static GLM_FUNC_QUALIFIER vec<3, T, P> rgb2YCoCgR
@@ -58,7 +58,7 @@ namespace glm
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	class compute_YCoCgR<T, P, true> {
 	public:
 		static GLM_FUNC_QUALIFIER vec<3, T, P> rgb2YCoCgR
@@ -88,7 +88,7 @@ namespace glm
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> rgb2YCoCgR
 	(
 		vec<3, T, P> const & rgbColor
@@ -97,7 +97,7 @@ namespace glm
 		return compute_YCoCgR<T, P, std::numeric_limits<T>::is_integer>::rgb2YCoCgR(rgbColor);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> YCoCgR2rgb
 	(
 		vec<3, T, P> const & YCoCgRColor
diff --git a/glm/gtx/common.hpp b/glm/gtx/common.hpp
index bfe55092..f3366dd0 100644
--- a/glm/gtx/common.hpp
+++ b/glm/gtx/common.hpp
@@ -39,7 +39,7 @@ namespace glm
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/isnan.xml">GLSL isnan man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_DECL typename genType::bool_type isdenormal(genType const & x);
 
 	/// Similar to 'mod' but with a different rounding and integer support.
@@ -47,8 +47,8 @@ namespace glm
 	/// 
 	/// @see <a href="http://stackoverflow.com/questions/7610631/glsl-mod-vs-hlsl-fmod">GLSL mod vs HLSL fmod</a>
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> fmod(vecType<D, T, P> const & v);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> fmod(vecType<L, T, P> const & v);
 
 	/// @}
 }//namespace glm
diff --git a/glm/gtx/common.inl b/glm/gtx/common.inl
index fe8b9f84..97b5c7d3 100644
--- a/glm/gtx/common.inl
+++ b/glm/gtx/common.inl
@@ -6,26 +6,26 @@
 namespace glm{
 namespace detail
 {
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType, bool isFloat = true>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType, bool isFloat = true>
 	struct compute_fmod
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & a, vecType<D, T, P> const & b)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & a, vecType<L, T, P> const & b)
 		{
-			return detail::functor2<D, T, P>::call(std::fmod, a, b);
+			return detail::functor2<L, T, P>::call(std::fmod, a, b);
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	struct compute_fmod<D, T, P, vecType, false>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_fmod<L, T, P, vecType, false>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & a, vecType<D, T, P> const & b)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & a, vecType<L, T, P> const & b)
 		{
 			return a % b;
 		}
 	};
 }//namespace detail
 
-	template <typename T> 
+	template<typename T> 
 	GLM_FUNC_QUALIFIER bool isdenormal(T const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isdenormal' only accept floating-point inputs");
@@ -37,7 +37,7 @@ namespace detail
 #		endif
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename vec<1, T, P>::bool_type isdenormal
 	(
 		vec<1, T, P> const & x
@@ -49,7 +49,7 @@ namespace detail
 			isdenormal(x.x));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename vec<2, T, P>::bool_type isdenormal
 	(
 		vec<2, T, P> const & x
@@ -62,7 +62,7 @@ namespace detail
 			isdenormal(x.y));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename vec<3, T, P>::bool_type isdenormal
 	(
 		vec<3, T, P> const & x
@@ -76,7 +76,7 @@ namespace detail
 			isdenormal(x.z));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename vec<4, T, P>::bool_type isdenormal
 	(
 		vec<4, T, P> const & x
@@ -92,21 +92,21 @@ namespace detail
 	}
 
 	// fmod
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fmod(genType x, genType y)
 	{
 		return fmod(vec<1, genType>(x), y).x;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fmod(vecType<D, T, P> const & x, T y)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fmod(vecType<L, T, P> const & x, T y)
 	{
-		return detail::compute_fmod<D, T, P, vecType, std::numeric_limits<T>::is_iec559>::call(x, vecType<D, T, P>(y));
+		return detail::compute_fmod<L, T, P, vecType, std::numeric_limits<T>::is_iec559>::call(x, vecType<L, T, P>(y));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fmod(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fmod(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 	{
-		return detail::compute_fmod<D, T, P, vecType, std::numeric_limits<T>::is_iec559>::call(x, y);
+		return detail::compute_fmod<L, T, P, vecType, std::numeric_limits<T>::is_iec559>::call(x, y);
 	}
 }//namespace glm
diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp
index 4c13b566..e11f7394 100644
--- a/glm/gtx/compatibility.hpp
+++ b/glm/gtx/compatibility.hpp
@@ -38,30 +38,30 @@ namespace glm
 	/// @addtogroup gtx_compatibility
 	/// @{
 
-	template <typename T> GLM_FUNC_QUALIFIER T lerp(T x, T y, T a){return mix(x, y, a);}																					//!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER vec<2, T, P> lerp(const vec<2, T, P>& x, const vec<2, T, P>& y, T a){return mix(x, y, a);}							//!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
+	template<typename T> GLM_FUNC_QUALIFIER T lerp(T x, T y, T a){return mix(x, y, a);}																					//!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_QUALIFIER vec<2, T, P> lerp(const vec<2, T, P>& x, const vec<2, T, P>& y, T a){return mix(x, y, a);}							//!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
 
-	template <typename T, precision P> GLM_FUNC_QUALIFIER vec<3, T, P> lerp(const vec<3, T, P>& x, const vec<3, T, P>& y, T a){return mix(x, y, a);}							//!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER vec<4, T, P> lerp(const vec<4, T, P>& x, const vec<4, T, P>& y, T a){return mix(x, y, a);}							//!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER vec<2, T, P> lerp(const vec<2, T, P>& x, const vec<2, T, P>& y, const vec<2, T, P>& a){return mix(x, y, a);}	//!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER vec<3, T, P> lerp(const vec<3, T, P>& x, const vec<3, T, P>& y, const vec<3, T, P>& a){return mix(x, y, a);}	//!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER vec<4, T, P> lerp(const vec<4, T, P>& x, const vec<4, T, P>& y, const vec<4, T, P>& a){return mix(x, y, a);}	//!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_QUALIFIER vec<3, T, P> lerp(const vec<3, T, P>& x, const vec<3, T, P>& y, T a){return mix(x, y, a);}							//!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_QUALIFIER vec<4, T, P> lerp(const vec<4, T, P>& x, const vec<4, T, P>& y, T a){return mix(x, y, a);}							//!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_QUALIFIER vec<2, T, P> lerp(const vec<2, T, P>& x, const vec<2, T, P>& y, const vec<2, T, P>& a){return mix(x, y, a);}	//!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_QUALIFIER vec<3, T, P> lerp(const vec<3, T, P>& x, const vec<3, T, P>& y, const vec<3, T, P>& a){return mix(x, y, a);}	//!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_QUALIFIER vec<4, T, P> lerp(const vec<4, T, P>& x, const vec<4, T, P>& y, const vec<4, T, P>& a){return mix(x, y, a);}	//!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
 
-	template <typename T, precision P> GLM_FUNC_QUALIFIER T saturate(T x){return clamp(x, T(0), T(1));}														//!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER vec<2, T, P> saturate(const vec<2, T, P>& x){return clamp(x, T(0), T(1));}					//!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER vec<3, T, P> saturate(const vec<3, T, P>& x){return clamp(x, T(0), T(1));}					//!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER vec<4, T, P> saturate(const vec<4, T, P>& x){return clamp(x, T(0), T(1));}					//!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_QUALIFIER T saturate(T x){return clamp(x, T(0), T(1));}														//!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_QUALIFIER vec<2, T, P> saturate(const vec<2, T, P>& x){return clamp(x, T(0), T(1));}					//!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_QUALIFIER vec<3, T, P> saturate(const vec<3, T, P>& x){return clamp(x, T(0), T(1));}					//!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_QUALIFIER vec<4, T, P> saturate(const vec<4, T, P>& x){return clamp(x, T(0), T(1));}					//!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
 
-	template <typename T, precision P> GLM_FUNC_QUALIFIER T atan2(T x, T y){return atan(x, y);}																//!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER vec<2, T, P> atan2(const vec<2, T, P>& x, const vec<2, T, P>& y){return atan(x, y);}	//!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER vec<3, T, P> atan2(const vec<3, T, P>& x, const vec<3, T, P>& y){return atan(x, y);}	//!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER vec<4, T, P> atan2(const vec<4, T, P>& x, const vec<4, T, P>& y){return atan(x, y);}	//!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_QUALIFIER T atan2(T x, T y){return atan(x, y);}																//!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_QUALIFIER vec<2, T, P> atan2(const vec<2, T, P>& x, const vec<2, T, P>& y){return atan(x, y);}	//!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_QUALIFIER vec<3, T, P> atan2(const vec<3, T, P>& x, const vec<3, T, P>& y){return atan(x, y);}	//!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_QUALIFIER vec<4, T, P> atan2(const vec<4, T, P>& x, const vec<4, T, P>& y){return atan(x, y);}	//!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
 
-	template <typename genType> GLM_FUNC_DECL bool isfinite(genType const & x);											//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_DECL vec<1, bool, P> isfinite(const vec<1, T, P>& x);				//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_DECL vec<2, bool, P> isfinite(const vec<2, T, P>& x);				//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_DECL vec<3, bool, P> isfinite(const vec<3, T, P>& x);				//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_DECL vec<4, bool, P> isfinite(const vec<4, T, P>& x);				//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
+	template<typename genType> GLM_FUNC_DECL bool isfinite(genType const & x);											//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_DECL vec<1, bool, P> isfinite(const vec<1, T, P>& x);				//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_DECL vec<2, bool, P> isfinite(const vec<2, T, P>& x);				//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_DECL vec<3, bool, P> isfinite(const vec<3, T, P>& x);				//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
+	template<typename T, precision P> GLM_FUNC_DECL vec<4, bool, P> isfinite(const vec<4, T, P>& x);				//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
 
 	typedef bool						bool1;			//!< \brief boolean type with 1 component. (From GLM_GTX_compatibility extension)
 	typedef vec<2, bool, highp>			bool2;			//!< \brief boolean type with 2 components. (From GLM_GTX_compatibility extension)
diff --git a/glm/gtx/compatibility.inl b/glm/gtx/compatibility.inl
index 2a80f9e5..cf1c07a1 100644
--- a/glm/gtx/compatibility.inl
+++ b/glm/gtx/compatibility.inl
@@ -6,7 +6,7 @@
 namespace glm
 {
 	// isfinite
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER bool isfinite(
 		genType const & x)
 	{
@@ -24,7 +24,7 @@ namespace glm
 #		endif
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<1, bool, P> isfinite(
 		vec<1, T, P> const & x)
 	{
@@ -32,7 +32,7 @@ namespace glm
 			isfinite(x.x));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, bool, P> isfinite(
 		vec<2, T, P> const & x)
 	{
@@ -41,7 +41,7 @@ namespace glm
 			isfinite(x.y));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, bool, P> isfinite(
 		vec<3, T, P> const & x)
 	{
@@ -51,7 +51,7 @@ namespace glm
 			isfinite(x.z));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, bool, P> isfinite(
 		vec<4, T, P> const & x)
 	{
diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp
index fc1bdceb..3b35ad19 100644
--- a/glm/gtx/component_wise.hpp
+++ b/glm/gtx/component_wise.hpp
@@ -34,33 +34,33 @@ namespace glm
 	/// Convert an integer vector to a normalized float vector.
 	/// If the parameter value type is already a floating precision type, the value is passed through.
 	/// @see gtx_component_wise
-	template <typename floatType, int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, floatType, P> compNormalize(vecType<D, T, P> const & v);
+	template<typename floatType, length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, floatType, P> compNormalize(vecType<L, T, P> const & v);
 
 	/// Convert a normalized float vector to an integer vector.
 	/// If the parameter value type is already a floating precision type, the value is passed through.
 	/// @see gtx_component_wise
-	template <int D, typename T, typename floatType, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> compScale(vecType<D, floatType, P> const & v);
+	template<length_t L, typename T, typename floatType, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> compScale(vecType<L, floatType, P> const & v);
 
 	/// Add all vector components together. 
 	/// @see gtx_component_wise
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_DECL typename genType::value_type compAdd(genType const & v);
 
 	/// Multiply all vector components together. 
 	/// @see gtx_component_wise
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_DECL typename genType::value_type compMul(genType const & v);
 
 	/// Find the minimum value between single vector components.
 	/// @see gtx_component_wise
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_DECL typename genType::value_type compMin(genType const & v);
 
 	/// Find the maximum value between single vector components.
 	/// @see gtx_component_wise
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_DECL typename genType::value_type compMax(genType const & v);
 
 	/// @}
diff --git a/glm/gtx/component_wise.inl b/glm/gtx/component_wise.inl
index 23ab9723..3961f3cd 100644
--- a/glm/gtx/component_wise.inl
+++ b/glm/gtx/component_wise.inl
@@ -6,92 +6,92 @@
 namespace glm{
 namespace detail
 {
-	template <int D, typename T, typename floatType, precision P, template <int, typename, precision> class vecType, bool isInteger, bool signedType>
+	template<length_t L, typename T, typename floatType, precision P, template<length_t, typename, precision> class vecType, bool isInteger, bool signedType>
 	struct compute_compNormalize
 	{};
 
-	template <int D, typename T, typename floatType, precision P, template <int, typename, precision> class vecType>
-	struct compute_compNormalize<D, T, floatType, P, vecType, true, true>
+	template<length_t L, typename T, typename floatType, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_compNormalize<L, T, floatType, P, vecType, true, true>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, floatType, P> call(vecType<D, T, P> const & v)
+		GLM_FUNC_QUALIFIER static vecType<L, floatType, P> call(vecType<L, T, P> const & v)
 		{
 			floatType const Min = static_cast<floatType>(std::numeric_limits<T>::min());
 			floatType const Max = static_cast<floatType>(std::numeric_limits<T>::max());
-			return (vecType<D, floatType, P>(v) - Min) / (Max - Min) * static_cast<floatType>(2) - static_cast<floatType>(1);
+			return (vecType<L, floatType, P>(v) - Min) / (Max - Min) * static_cast<floatType>(2) - static_cast<floatType>(1);
 		}
 	};
 
-	template <int D, typename T, typename floatType, precision P, template <int, typename, precision> class vecType>
-	struct compute_compNormalize<D, T, floatType, P, vecType, true, false>
+	template<length_t L, typename T, typename floatType, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_compNormalize<L, T, floatType, P, vecType, true, false>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, floatType, P> call(vecType<D, T, P> const & v)
+		GLM_FUNC_QUALIFIER static vecType<L, floatType, P> call(vecType<L, T, P> const & v)
 		{
-			return vecType<D, floatType, P>(v) / static_cast<floatType>(std::numeric_limits<T>::max());
+			return vecType<L, floatType, P>(v) / static_cast<floatType>(std::numeric_limits<T>::max());
 		}
 	};
 
-	template <int D, typename T, typename floatType, precision P, template <int, typename, precision> class vecType>
-	struct compute_compNormalize<D, T, floatType, P, vecType, false, true>
+	template<length_t L, typename T, typename floatType, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_compNormalize<L, T, floatType, P, vecType, false, true>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, floatType, P> call(vecType<D, T, P> const & v)
+		GLM_FUNC_QUALIFIER static vecType<L, floatType, P> call(vecType<L, T, P> const & v)
 		{
 			return v;
 		}
 	};
 
-	template <int D, typename T, typename floatType, precision P, template <int, typename, precision> class vecType, bool isInteger, bool signedType>
+	template<length_t L, typename T, typename floatType, precision P, template<length_t, typename, precision> class vecType, bool isInteger, bool signedType>
 	struct compute_compScale
 	{};
 
-	template <int D, typename T, typename floatType, precision P, template <int, typename, precision> class vecType>
-	struct compute_compScale<D, T, floatType, P, vecType, true, true>
+	template<length_t L, typename T, typename floatType, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_compScale<L, T, floatType, P, vecType, true, true>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, floatType, P> const & v)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, floatType, P> const & v)
 		{
 			floatType const Max = static_cast<floatType>(std::numeric_limits<T>::max()) + static_cast<floatType>(0.5);
-			vecType<D, floatType, P> const Scaled(v * Max);
-			vecType<D, T, P> const Result(Scaled - static_cast<floatType>(0.5));
+			vecType<L, floatType, P> const Scaled(v * Max);
+			vecType<L, T, P> const Result(Scaled - static_cast<floatType>(0.5));
 			return Result;
 		}
 	};
 
-	template <int D, typename T, typename floatType, precision P, template <int, typename, precision> class vecType>
-	struct compute_compScale<D, T, floatType, P, vecType, true, false>
+	template<length_t L, typename T, typename floatType, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_compScale<L, T, floatType, P, vecType, true, false>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, floatType, P> const & v)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, floatType, P> const & v)
 		{
-			return vecType<D, T, P>(vecType<D, floatType, P>(v) * static_cast<floatType>(std::numeric_limits<T>::max()));
+			return vecType<L, T, P>(vecType<L, floatType, P>(v) * static_cast<floatType>(std::numeric_limits<T>::max()));
 		}
 	};
 
-	template <int D, typename T, typename floatType, precision P, template <int, typename, precision> class vecType>
-	struct compute_compScale<D, T, floatType, P, vecType, false, true>
+	template<length_t L, typename T, typename floatType, precision P, template<length_t, typename, precision> class vecType>
+	struct compute_compScale<L, T, floatType, P, vecType, false, true>
 	{
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, floatType, P> const & v)
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, floatType, P> const & v)
 		{
 			return v;
 		}
 	};
 }//namespace detail
 
-	template <typename floatType, int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, floatType, P> compNormalize(vecType<D, T, P> const & v)
+	template<typename floatType, length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, floatType, P> compNormalize(vecType<L, T, P> const & v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<floatType>::is_iec559, "'compNormalize' accepts only floating-point types for 'floatType' template parameter");
 
-		return detail::compute_compNormalize<D, T, floatType, P, vecType, std::numeric_limits<T>::is_integer, std::numeric_limits<T>::is_signed>::call(v);
+		return detail::compute_compNormalize<L, T, floatType, P, vecType, std::numeric_limits<T>::is_integer, std::numeric_limits<T>::is_signed>::call(v);
 	}
 
-	template <typename T, int D, typename floatType, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> compScale(vecType<D, floatType, P> const & v)
+	template<typename T, length_t L, typename floatType, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> compScale(vecType<L, floatType, P> const & v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<floatType>::is_iec559, "'compScale' accepts only floating-point types for 'floatType' template parameter");
 
-		return detail::compute_compScale<D, T, floatType, P, vecType, std::numeric_limits<T>::is_integer, std::numeric_limits<T>::is_signed>::call(v);
+		return detail::compute_compScale<L, T, floatType, P, vecType, std::numeric_limits<T>::is_integer, std::numeric_limits<T>::is_signed>::call(v);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T compAdd(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER T compAdd(vecType<L, T, P> const & v)
 	{
 		T Result(0);
 		for(length_t i = 0, n = v.length(); i < n; ++i)
@@ -99,8 +99,8 @@ namespace detail
 		return Result;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T compMul(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER T compMul(vecType<L, T, P> const & v)
 	{
 		T Result(1);
 		for(length_t i = 0, n = v.length(); i < n; ++i)
@@ -108,8 +108,8 @@ namespace detail
 		return Result;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T compMin(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER T compMin(vecType<L, T, P> const & v)
 	{
 		T Result(v[0]);
 		for(length_t i = 1, n = v.length(); i < n; ++i)
@@ -117,8 +117,8 @@ namespace detail
 		return Result;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T compMax(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER T compMax(vecType<L, T, P> const & v)
 	{
 		T Result(v[0]);
 		for(length_t i = 1, n = v.length(); i < n; ++i)
diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp
index 9320a445..1fa23f57 100644
--- a/glm/gtx/dual_quaternion.hpp
+++ b/glm/gtx/dual_quaternion.hpp
@@ -33,7 +33,7 @@ namespace glm
 	/// @addtogroup gtx_dual_quaternion
 	/// @{
 
-	template <typename T, precision P = defaultp>
+	template<typename T, precision P = defaultp>
 	struct tdualquat
 	{
 		// -- Implementation detail --
@@ -58,7 +58,7 @@ namespace glm
 
 		GLM_FUNC_DECL GLM_CONSTEXPR tdualquat() GLM_DEFAULT_CTOR;
 		GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tdualquat<T, P> const & d) GLM_DEFAULT;
-		template <precision Q>
+		template<precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tdualquat<T, Q> const & d);
 
 		// -- Explicit basic constructors --
@@ -70,7 +70,7 @@ namespace glm
 
 		// -- Conversion constructors --
 
-		template <typename U, precision Q>
+		template<typename U, precision Q>
 		GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tdualquat(tdualquat<U, Q> const & q);
 
 		GLM_FUNC_DECL GLM_EXPLICIT tdualquat(mat<2, 4, T, P> const & holder_mat);
@@ -80,99 +80,99 @@ namespace glm
 
 		GLM_FUNC_DECL tdualquat<T, P> & operator=(tdualquat<T, P> const & m) GLM_DEFAULT;
 
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL tdualquat<T, P> & operator=(tdualquat<U, P> const & m);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL tdualquat<T, P> & operator*=(U s);
-		template <typename U>
+		template<typename U>
 		GLM_FUNC_DECL tdualquat<T, P> & operator/=(U s);
 	};
 
 	// -- Unary bit operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tdualquat<T, P> operator+(tdualquat<T, P> const & q);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tdualquat<T, P> operator-(tdualquat<T, P> const & q);
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tdualquat<T, P> operator+(tdualquat<T, P> const & q, tdualquat<T, P> const & p);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tdualquat<T, P> operator*(tdualquat<T, P> const & q, tdualquat<T, P> const & p);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator*(tdualquat<T, P> const & q, vec<3, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> operator*(vec<3, T, P> const & v, tdualquat<T, P> const & q);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator*(tdualquat<T, P> const & q, vec<4, T, P> const & v);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> operator*(vec<4, T, P> const & v, tdualquat<T, P> const & q);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tdualquat<T, P> operator*(tdualquat<T, P> const & q, T const & s);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tdualquat<T, P> operator*(T const & s, tdualquat<T, P> const & q);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tdualquat<T, P> operator/(tdualquat<T, P> const & q, T const & s);
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator==(tdualquat<T, P> const & q1, tdualquat<T, P> const & q2);
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool operator!=(tdualquat<T, P> const & q1, tdualquat<T, P> const & q2);
 
 	/// Returns the normalized quaternion.
 	///
 	/// @see gtx_dual_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tdualquat<T, P> normalize(tdualquat<T, P> const & q);
 
 	/// Returns the linear interpolation of two dual quaternion.
 	///
 	/// @see gtc_dual_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tdualquat<T, P> lerp(tdualquat<T, P> const & x, tdualquat<T, P> const & y, T const & a);
 
 	/// Returns the q inverse.
 	///
 	/// @see gtx_dual_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tdualquat<T, P> inverse(tdualquat<T, P> const & q);
 
 	/// Converts a quaternion to a 2 * 4 matrix.
 	///
 	/// @see gtx_dual_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 4, T, P> mat2x4_cast(tdualquat<T, P> const & x);
 
 	/// Converts a quaternion to a 3 * 4 matrix.
 	///
 	/// @see gtx_dual_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 4, T, P> mat3x4_cast(tdualquat<T, P> const & x);
 
 	/// Converts a 2 * 4 matrix (matrix which holds real and dual parts) to a quaternion.
 	///
 	/// @see gtx_dual_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tdualquat<T, P> dualquat_cast(mat<2, 4, T, P> const & x);
 
 	/// Converts a 3 * 4 matrix (augmented matrix rotation + translation) to a quaternion.
 	///
 	/// @see gtx_dual_quaternion
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tdualquat<T, P> dualquat_cast(mat<3, 4, T, P> const & x);
 
 
diff --git a/glm/gtx/dual_quaternion.inl b/glm/gtx/dual_quaternion.inl
index 32c862bd..df330ffa 100644
--- a/glm/gtx/dual_quaternion.inl
+++ b/glm/gtx/dual_quaternion.inl
@@ -8,14 +8,14 @@ namespace glm
 {
 	// -- Component accesses --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename tdualquat<T, P>::part_type & tdualquat<T, P>::operator[](typename tdualquat<T, P>::length_type i)
 	{
 		assert(i >= 0 && i < this->length());
 		return (&real)[i];
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER typename tdualquat<T, P>::part_type const & tdualquat<T, P>::operator[](typename tdualquat<T, P>::length_type i) const
 	{
 		assert(i >= 0 && i < this->length());
@@ -25,7 +25,7 @@ namespace glm
 	// -- Implicit basic constructors --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat()
 #			ifndef GLM_FORCE_NO_CTOR_INIT 
 				: real(tquat<T, P>())
@@ -35,15 +35,15 @@ namespace glm
 #	endif
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tdualquat<T, P> const & d)
 			: real(d.real)
 			, dual(d.dual)
 		{}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <precision Q>
+	template<typename T, precision P>
+	template<precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tdualquat<T, Q> const & d)
 		: real(d.real)
 		, dual(d.dual)
@@ -51,16 +51,16 @@ namespace glm
 
 	// -- Explicit basic constructors --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tdualquat<T, P>::tdualquat(ctor)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tquat<T, P> const & r)
 		: real(r), dual(tquat<T, P>(0, 0, 0, 0))
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tquat<T, P> const & q, vec<3, T, P> const& p)
 		: real(q), dual(
 			T(-0.5) * ( p.x*q.x + p.y*q.y + p.z*q.z),
@@ -69,27 +69,27 @@ namespace glm
 			T(+0.5) * ( p.x*q.y - p.y*q.x + p.z*q.w))
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tquat<T, P> const & r, tquat<T, P> const & d)
 		: real(r), dual(d)
 	{}
 
 	// -- Conversion constructors --
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
+	template<typename T, precision P>
+	template<typename U, precision Q>
 	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tdualquat<U, Q> const & q)
 		: real(q.real)
 		, dual(q.dual)
 	{}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(mat<2, 4, T, P> const & m)
 	{
 		*this = dualquat_cast(m);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(mat<3, 4, T, P> const & m)
 	{
 		*this = dualquat_cast(m);
@@ -98,7 +98,7 @@ namespace glm
 	// -- Unary arithmetic operators --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
+		template<typename T, precision P>
 		GLM_FUNC_QUALIFIER tdualquat<T, P> & tdualquat<T, P>::operator=(tdualquat<T, P> const & q)
 		{
 			this->real = q.real;
@@ -107,8 +107,8 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER tdualquat<T, P> & tdualquat<T, P>::operator=(tdualquat<U, P> const & q)
 	{
 		this->real = q.real;
@@ -116,8 +116,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER tdualquat<T, P> & tdualquat<T, P>::operator*=(U s)
 	{
 		this->real *= static_cast<T>(s);
@@ -125,8 +125,8 @@ namespace glm
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
+	template<typename T, precision P>
+	template<typename U>
 	GLM_FUNC_QUALIFIER tdualquat<T, P> & tdualquat<T, P>::operator/=(U s)
 	{
 		this->real /= static_cast<T>(s);
@@ -136,13 +136,13 @@ namespace glm
 
 	// -- Unary bit operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tdualquat<T, P> operator+(tdualquat<T, P> const & q)
 	{
 		return q;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tdualquat<T, P> operator-(tdualquat<T, P> const & q)
 	{
 		return tdualquat<T, P>(-q.real, -q.dual);
@@ -150,19 +150,19 @@ namespace glm
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tdualquat<T, P> operator+(tdualquat<T, P> const & q, tdualquat<T, P> const & p)
 	{
 		return tdualquat<T, P>(q.real + p.real,q.dual + p.dual);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tdualquat<T, P> operator*(tdualquat<T, P> const & p, tdualquat<T, P> const & o)
 	{
 		return tdualquat<T, P>(p.real * o.real,p.real * o.dual + p.dual * o.real);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator*(tdualquat<T, P> const & q, vec<3, T, P> const & v)
 	{
 		vec<3, T, P> const real_v3(q.real.x,q.real.y,q.real.z);
@@ -170,37 +170,37 @@ namespace glm
 		return (cross(real_v3, cross(real_v3,v) + v * q.real.w + dual_v3) + dual_v3 * q.real.w - real_v3 * q.dual.w) * T(2) + v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> operator*(vec<3, T, P> const & v,	tdualquat<T, P> const & q)
 	{
 		return glm::inverse(q) * v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator*(tdualquat<T, P> const & q, vec<4, T, P> const & v)
 	{
 		return vec<4, T, P>(q * vec<3, T, P>(v), v.w);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> operator*(vec<4, T, P> const & v,	tdualquat<T, P> const & q)
 	{
 		return glm::inverse(q) * v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tdualquat<T, P> operator*(tdualquat<T, P> const & q, T const & s)
 	{
 		return tdualquat<T, P>(q.real * s, q.dual * s);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tdualquat<T, P> operator*(T const & s, tdualquat<T, P> const & q)
 	{
 		return q * s;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tdualquat<T, P> operator/(tdualquat<T, P> const & q,	T const & s)
 	{
 		return tdualquat<T, P>(q.real / s, q.dual / s);
@@ -208,13 +208,13 @@ namespace glm
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator==(tdualquat<T, P> const & q1, tdualquat<T, P> const & q2)
 	{
 		return (q1.real == q2.real) && (q1.dual == q2.dual);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool operator!=(tdualquat<T, P> const & q1, tdualquat<T, P> const & q2)
 	{
 		return (q1.real != q2.dual) || (q1.real != q2.dual);
@@ -222,13 +222,13 @@ namespace glm
 
 	// -- Operations --
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tdualquat<T, P> normalize(tdualquat<T, P> const & q)
 	{
 		return q / length(q.real);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tdualquat<T, P> lerp(tdualquat<T, P> const & x, tdualquat<T, P> const & y, T const & a)
 	{
 		// Dual Quaternion Linear blend aka DLB:
@@ -240,7 +240,7 @@ namespace glm
 		return tdualquat<T, P>(x * (one - a) + y * k);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tdualquat<T, P> inverse(tdualquat<T, P> const & q)
 	{
 		const glm::tquat<T, P> real = conjugate(q.real);
@@ -248,13 +248,13 @@ namespace glm
 		return tdualquat<T, P>(real, dual + (real * (-2.0f * dot(real,dual))));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> mat2x4_cast(tdualquat<T, P> const & x)
 	{
 		return mat<2, 4, T, P>( x[0].x, x[0].y, x[0].z, x[0].w, x[1].x, x[1].y, x[1].z, x[1].w );
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> mat3x4_cast(tdualquat<T, P> const & x)
 	{
 		tquat<T, P> r = x.real / length2(x.real);
@@ -290,7 +290,7 @@ namespace glm
 		return mat<3, 4, T, P>(a, b, c);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tdualquat<T, P> dualquat_cast(mat<2, 4, T, P> const & x)
 	{
 		return tdualquat<T, P>(
@@ -298,7 +298,7 @@ namespace glm
 			tquat<T, P>( x[1].w, x[1].x, x[1].y, x[1].z ));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tdualquat<T, P> dualquat_cast(mat<3, 4, T, P> const & x)
 	{
 		tquat<T, P> real(uninitialize);
diff --git a/glm/gtx/euler_angles.hpp b/glm/gtx/euler_angles.hpp
index e07810e0..6985faa6 100644
--- a/glm/gtx/euler_angles.hpp
+++ b/glm/gtx/euler_angles.hpp
@@ -30,67 +30,67 @@ namespace glm
 
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from an euler angle X.
 	/// @see gtx_euler_angles
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleX(
 		T const & angleX);
 
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from an euler angle Y.
 	/// @see gtx_euler_angles
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleY(
 		T const & angleY);
 
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from an euler angle Z.
 	/// @see gtx_euler_angles
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleZ(
 		T const & angleZ);
 
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (X * Y).
 	/// @see gtx_euler_angles
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleXY(
 		T const & angleX,
 		T const & angleY);
 
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X).
 	/// @see gtx_euler_angles
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleYX(
 		T const & angleY,
 		T const & angleX);
 
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (X * Z).
 	/// @see gtx_euler_angles
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleXZ(
 		T const & angleX,
 		T const & angleZ);
 
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Z * X).
 	/// @see gtx_euler_angles
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleZX(
 		T const & angle,
 		T const & angleX);
 
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * Z).
 	/// @see gtx_euler_angles
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleYZ(
 		T const & angleY,
 		T const & angleZ);
 
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Z * Y).
 	/// @see gtx_euler_angles
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleZY(
 		T const & angleZ,
 		T const & angleY);
 
     /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (X * Y * Z).
     /// @see gtx_euler_angles
-    template <typename T>
+    template<typename T>
     GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleXYZ(
         T const & t1,
         T const & t2,
@@ -98,7 +98,7 @@ namespace glm
     
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X * Z).
 	/// @see gtx_euler_angles
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleYXZ(
 		T const & yaw,
 		T const & pitch,
@@ -106,7 +106,7 @@ namespace glm
     
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X * Z).
 	/// @see gtx_euler_angles
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<4, 4, T, defaultp> yawPitchRoll(
 		T const & yaw,
 		T const & pitch,
@@ -114,27 +114,27 @@ namespace glm
 
 	/// Creates a 2D 2 * 2 rotation matrix from an euler angle.
 	/// @see gtx_euler_angles
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<2, 2, T, defaultp> orientate2(T const & angle);
 
 	/// Creates a 2D 4 * 4 homogeneous rotation matrix from an euler angle.
 	/// @see gtx_euler_angles
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL mat<3, 3, T, defaultp> orientate3(T const & angle);
 
 	/// Creates a 3D 3 * 3 rotation matrix from euler angles (Y * X * Z). 
 	/// @see gtx_euler_angles
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> orientate3(vec<3, T, P> const & angles);
 		
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X * Z).
 	/// @see gtx_euler_angles
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> orientate4(vec<3, T, P> const & angles);
 
     /// Extracts the (X * Y * Z) Euler angles from the rotation matrix M
     /// @see gtx_euler_angles
-    template <typename T>
+    template<typename T>
     GLM_FUNC_DECL void extractEulerAngleXYZ(mat<4, 4, T, defaultp> const & M,
                                             T & t1,
                                             T & t2,
diff --git a/glm/gtx/euler_angles.inl b/glm/gtx/euler_angles.inl
index aa058155..bed37416 100644
--- a/glm/gtx/euler_angles.inl
+++ b/glm/gtx/euler_angles.inl
@@ -5,7 +5,7 @@
 
 namespace glm
 {
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleX
 	(
 		T const & angleX
@@ -21,7 +21,7 @@ namespace glm
 			T(0), T(0), T(0), T(1));
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleY
 	(
 		T const & angleY
@@ -37,7 +37,7 @@ namespace glm
 			T(0),	T(0),	T(0),	T(1));
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleZ
 	(
 		T const & angleZ
@@ -53,7 +53,7 @@ namespace glm
 			T(0),	T(0),	T(0), T(1));
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleXY
 	(
 		T const & angleX,
@@ -72,7 +72,7 @@ namespace glm
 			T(0),   T(0),           T(0),           T(1));
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleYX
 	(
 		T const & angleY,
@@ -91,7 +91,7 @@ namespace glm
 			T(0),         T(0),     T(0),    T(1));
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleXZ
 	(
 		T const & angleX,
@@ -101,7 +101,7 @@ namespace glm
 		return eulerAngleX(angleX) * eulerAngleZ(angleZ);
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleZX
 	(
 		T const & angleZ,
@@ -111,7 +111,7 @@ namespace glm
 		return eulerAngleZ(angleZ) * eulerAngleX(angleX);
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleYZ
 	(
 		T const & angleY,
@@ -121,7 +121,7 @@ namespace glm
 		return eulerAngleY(angleY) * eulerAngleZ(angleZ);
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleZY
 	(
 		T const & angleZ,
@@ -131,7 +131,7 @@ namespace glm
 		return eulerAngleZ(angleZ) * eulerAngleY(angleY);
 	}
     
-    template <typename T>
+    template<typename T>
     GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleXYZ
     (
      T const & t1,
@@ -166,7 +166,7 @@ namespace glm
         return Result;
     }
     
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleYXZ
 	(
 		T const & yaw,
@@ -201,7 +201,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> yawPitchRoll
 	(
 		T const & yaw,
@@ -236,7 +236,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, defaultp> orientate2
 	(
 		T const & angle
@@ -253,7 +253,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, defaultp> orientate3
 	(
 		T const & angle
@@ -275,7 +275,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> orientate3
 	(
 		vec<3, T, P> const & angles
@@ -284,7 +284,7 @@ namespace glm
 		return mat<3, 3, T, P>(yawPitchRoll(angles.z, angles.x, angles.y));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> orientate4
 	(
 		vec<3, T, P> const & angles
@@ -293,7 +293,7 @@ namespace glm
 		return yawPitchRoll(angles.z, angles.x, angles.y);
 	}
     
-    template <typename T>
+    template<typename T>
     GLM_FUNC_DECL void extractEulerAngleXYZ(mat<4, 4, T, defaultp> const & M,
                                             T & t1,
                                             T & t2,
diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp
index ce42e4fe..aa752704 100644
--- a/glm/gtx/extend.hpp
+++ b/glm/gtx/extend.hpp
@@ -30,7 +30,7 @@ namespace glm
 
 	/// Extends of Length the Origin position using the (Source - Origin) direction.
 	/// @see gtx_extend
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_DECL genType extend(
 		genType const & Origin, 
 		genType const & Source, 
diff --git a/glm/gtx/extend.inl b/glm/gtx/extend.inl
index d8c0b6f6..3939abd4 100644
--- a/glm/gtx/extend.inl
+++ b/glm/gtx/extend.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType extend
 	(
 		genType const & Origin, 
@@ -14,7 +14,7 @@ namespace glm
 		return Origin + (Source - Origin) * Distance;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> extend
 	(
 		vec<2, T, P> const & Origin,
@@ -25,7 +25,7 @@ namespace glm
 		return Origin + (Source - Origin) * Distance;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> extend
 	(
 		vec<3, T, P> const & Origin,
@@ -36,7 +36,7 @@ namespace glm
 		return Origin + (Source - Origin) * Distance;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> extend
 	(
 		vec<4, T, P> const & Origin,
diff --git a/glm/gtx/extended_min_max.hpp b/glm/gtx/extended_min_max.hpp
index 7bdb0897..537af0ce 100644
--- a/glm/gtx/extended_min_max.hpp
+++ b/glm/gtx/extended_min_max.hpp
@@ -30,7 +30,7 @@ namespace glm
 
 	/// Return the minimum component-wise values of 3 inputs 
 	/// @see gtx_extented_min_max
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T min(
 		T const & x, 
 		T const & y, 
@@ -38,7 +38,7 @@ namespace glm
 
 	/// Return the minimum component-wise values of 3 inputs
 	/// @see gtx_extented_min_max
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_DECL C<T> min(
 		C<T> const & x, 
 		typename C<T>::T const & y, 
@@ -46,7 +46,7 @@ namespace glm
 
 	/// Return the minimum component-wise values of 3 inputs 
 	/// @see gtx_extented_min_max
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_DECL C<T> min(
 		C<T> const & x, 
 		C<T> const & y, 
@@ -54,7 +54,7 @@ namespace glm
 
 	/// Return the minimum component-wise values of 4 inputs 
 	/// @see gtx_extented_min_max
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T min(
 		T const & x, 
 		T const & y, 
@@ -63,7 +63,7 @@ namespace glm
 
 	/// Return the minimum component-wise values of 4 inputs 
 	/// @see gtx_extented_min_max
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_DECL C<T> min(
 		C<T> const & x, 
 		typename C<T>::T const & y, 
@@ -72,7 +72,7 @@ namespace glm
 
 	/// Return the minimum component-wise values of 4 inputs
 	/// @see gtx_extented_min_max
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_DECL C<T> min(
 		C<T> const & x, 
 		C<T> const & y, 
@@ -81,7 +81,7 @@ namespace glm
 
 	/// Return the maximum component-wise values of 3 inputs 
 	/// @see gtx_extented_min_max
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T max(
 		T const & x, 
 		T const & y, 
@@ -89,7 +89,7 @@ namespace glm
 
 	/// Return the maximum component-wise values of 3 inputs
 	/// @see gtx_extented_min_max
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_DECL C<T> max(
 		C<T> const & x, 
 		typename C<T>::T const & y, 
@@ -97,7 +97,7 @@ namespace glm
 
 	/// Return the maximum component-wise values of 3 inputs 
 	/// @see gtx_extented_min_max
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_DECL C<T> max(
 		C<T> const & x, 
 		C<T> const & y, 
@@ -105,7 +105,7 @@ namespace glm
 
 	/// Return the maximum component-wise values of 4 inputs
 	/// @see gtx_extented_min_max
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T max(
 		T const & x, 
 		T const & y, 
@@ -114,7 +114,7 @@ namespace glm
 
 	/// Return the maximum component-wise values of 4 inputs 
 	/// @see gtx_extented_min_max
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_DECL C<T> max(
 		C<T> const & x, 
 		typename C<T>::T const & y, 
@@ -123,7 +123,7 @@ namespace glm
 
 	/// Return the maximum component-wise values of 4 inputs 
 	/// @see gtx_extented_min_max
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_DECL C<T> max(
 		C<T> const & x, 
 		C<T> const & y, 
diff --git a/glm/gtx/extended_min_max.inl b/glm/gtx/extended_min_max.inl
index 64ea4452..be09c93d 100644
--- a/glm/gtx/extended_min_max.inl
+++ b/glm/gtx/extended_min_max.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T min(
 		T const & x, 
 		T const & y, 
@@ -12,7 +12,7 @@ namespace glm
 		return glm::min(glm::min(x, y), z);
 	}
 
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_QUALIFIER C<T> min
 	(
 		C<T> const & x, 
@@ -23,7 +23,7 @@ namespace glm
 		return glm::min(glm::min(x, y), z);
 	}
 
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_QUALIFIER C<T> min
 	(
 		C<T> const & x, 
@@ -34,7 +34,7 @@ namespace glm
 		return glm::min(glm::min(x, y), z);
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T min
 	(
 		T const & x, 
@@ -46,7 +46,7 @@ namespace glm
 		return glm::min(glm::min(x, y), glm::min(z, w));
 	}
 
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_QUALIFIER C<T> min
 	(
 		C<T> const & x, 
@@ -58,7 +58,7 @@ namespace glm
 		return glm::min(glm::min(x, y), glm::min(z, w));
 	}
 
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_QUALIFIER C<T> min
 	(
 		C<T> const & x, 
@@ -70,7 +70,7 @@ namespace glm
 		return glm::min(glm::min(x, y), glm::min(z, w));
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T max(
 		T const & x, 
 		T const & y, 
@@ -79,7 +79,7 @@ namespace glm
 		return glm::max(glm::max(x, y), z);
 	}
 
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_QUALIFIER C<T> max
 	(
 		C<T> const & x, 
@@ -90,7 +90,7 @@ namespace glm
 		return glm::max(glm::max(x, y), z);
 	}
 
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_QUALIFIER C<T> max
 	(
 		C<T> const & x, 
@@ -101,7 +101,7 @@ namespace glm
 		return glm::max(glm::max(x, y), z);
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T max
 	(
 		T const & x, 
@@ -113,7 +113,7 @@ namespace glm
 		return glm::max(glm::max(x, y), glm::max(z, w));
 	}
 
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_QUALIFIER C<T> max
 	(
 		C<T> const & x, 
@@ -125,7 +125,7 @@ namespace glm
 		return glm::max(glm::max(x, y), glm::max(z, w));
 	}
 
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_QUALIFIER C<T> max
 	(
 		C<T> const & x, 
diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp
index 3111f0d6..80822c81 100644
--- a/glm/gtx/fast_exponential.hpp
+++ b/glm/gtx/fast_exponential.hpp
@@ -31,63 +31,63 @@ namespace glm
 
 	/// Faster than the common pow function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType fastPow(genType x, genType y);
 
 	/// Faster than the common pow function but less accurate.
 	/// @see gtx_fast_exponential
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> fastPow(vecType<D, T, P> const & x, vecType<D, T, P> const & y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> fastPow(vecType<L, T, P> const & x, vecType<L, T, P> const & y);
 
 	/// Faster than the common pow function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename genTypeT, typename genTypeU>
+	template<typename genTypeT, typename genTypeU>
 	GLM_FUNC_DECL genTypeT fastPow(genTypeT x, genTypeU y);
 
 	/// Faster than the common pow function but less accurate.
 	/// @see gtx_fast_exponential
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> fastPow(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> fastPow(vecType<L, T, P> const & x);
 
 	/// Faster than the common exp function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T fastExp(T x);
 
 	/// Faster than the common exp function but less accurate.
 	/// @see gtx_fast_exponential
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> fastExp(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> fastExp(vecType<L, T, P> const & x);
 
 	/// Faster than the common log function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T fastLog(T x);
 
 	/// Faster than the common exp2 function but less accurate.
 	/// @see gtx_fast_exponential
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> fastLog(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> fastLog(vecType<L, T, P> const & x);
 
 	/// Faster than the common exp2 function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T fastExp2(T x);
 
 	/// Faster than the common exp2 function but less accurate.
 	/// @see gtx_fast_exponential
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> fastExp2(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> fastExp2(vecType<L, T, P> const & x);
 
 	/// Faster than the common log2 function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T fastLog2(T x);
 
 	/// Faster than the common log2 function but less accurate.
 	/// @see gtx_fast_exponential
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> fastLog2(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> fastLog2(vecType<L, T, P> const & x);
 
 	/// @}
 }//namespace glm
diff --git a/glm/gtx/fast_exponential.inl b/glm/gtx/fast_exponential.inl
index c57e0643..54fcfcc9 100644
--- a/glm/gtx/fast_exponential.inl
+++ b/glm/gtx/fast_exponential.inl
@@ -4,19 +4,19 @@
 namespace glm
 {
 	// fastPow:
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastPow(genType x, genType y)
 	{
 		return exp(y * log(x));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastPow(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastPow(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 	{
 		return exp(y * log(x));
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T fastPow(T x, int y)
 	{
 		T f = static_cast<T>(1);
@@ -25,10 +25,10 @@ namespace glm
 		return f;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastPow(vecType<D, T, P> const & x, vecType<D, int, P> const & y)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastPow(vecType<L, T, P> const & x, vecType<L, int, P> const & y)
 	{
-		vecType<D, T, P> Result(uninitialize);
+		vecType<L, T, P> Result(uninitialize);
 		for(length_t i = 0, n = x.length(); i < n; ++i)
 			Result[i] = fastPow(x[i], y[i]);
 		return Result;
@@ -36,7 +36,7 @@ namespace glm
 
 	// fastExp
 	// Note: This function provides accurate results only for value between -1 and 1, else avoid it.
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T fastExp(T x)
 	{
 		// This has a better looking and same performance in release mode than the following code. However, in debug mode it's slower.
@@ -81,14 +81,14 @@ namespace glm
 	}
 	*/
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastExp(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastExp(vecType<L, T, P> const & x)
 	{
-		return detail::functor1<D, T, T, P>::call(fastExp, x);
+		return detail::functor1<L, T, T, P>::call(fastExp, x);
 	}
 
 	// fastLog
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastLog(genType x)
 	{
 		return std::log(x);
@@ -103,35 +103,35 @@ namespace glm
 	}
 	*/
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastLog(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastLog(vecType<L, T, P> const & x)
 	{
-		return detail::functor1<D, T, T, P>::call(fastLog, x);
+		return detail::functor1<L, T, T, P>::call(fastLog, x);
 	}
 
 	//fastExp2, ln2 = 0.69314718055994530941723212145818f
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastExp2(genType x)
 	{
 		return fastExp(0.69314718055994530941723212145818f * x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastExp2(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastExp2(vecType<L, T, P> const & x)
 	{
-		return detail::functor1<D, T, T, P>::call(fastExp2, x);
+		return detail::functor1<L, T, T, P>::call(fastExp2, x);
 	}
 
 	// fastLog2, ln2 = 0.69314718055994530941723212145818f
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastLog2(genType x)
 	{
 		return fastLog(x) / 0.69314718055994530941723212145818f;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastLog2(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastLog2(vecType<L, T, P> const & x)
 	{
-		return detail::functor1<D, T, T, P>::call(fastLog2, x);
+		return detail::functor1<L, T, T, P>::call(fastLog2, x);
 	}
 }//namespace glm
diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp
index e69e1a68..135829b0 100644
--- a/glm/gtx/fast_square_root.hpp
+++ b/glm/gtx/fast_square_root.hpp
@@ -35,55 +35,55 @@ namespace glm
 	/// Faster than the common sqrt function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_DECL genType fastSqrt(genType x);
 
 	/// Faster than the common sqrt function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> fastSqrt(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> fastSqrt(vecType<L, T, P> const & x);
 
 	/// Faster than the common inversesqrt function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_DECL genType fastInverseSqrt(genType x);
 
 	/// Faster than the common inversesqrt function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> fastInverseSqrt(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> fastInverseSqrt(vecType<L, T, P> const & x);
 
 	/// Faster than the common length function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType fastLength(genType x);
 
 	/// Faster than the common length function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL T fastLength(vecType<D, T, P> const & x);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL T fastLength(vecType<L, T, P> const & x);
 
 	/// Faster than the common distance function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType fastDistance(genType x, genType y);
 
 	/// Faster than the common distance function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL T fastDistance(vecType<D, T, P> const & x, vecType<D, T, P> const & y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL T fastDistance(vecType<L, T, P> const & x, vecType<L, T, P> const & y);
 
 	/// Faster than the common normalize function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_DECL genType fastNormalize(genType const & x);
 
 	/// @}
diff --git a/glm/gtx/fast_square_root.inl b/glm/gtx/fast_square_root.inl
index 40873460..846659ab 100644
--- a/glm/gtx/fast_square_root.inl
+++ b/glm/gtx/fast_square_root.inl
@@ -4,7 +4,7 @@
 namespace glm
 {
 	// fastSqrt
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastSqrt(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fastSqrt' only accept floating-point input");
@@ -12,14 +12,14 @@ namespace glm
 		return genType(1) / fastInverseSqrt(x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastSqrt(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastSqrt(vecType<L, T, P> const & x)
 	{
-		return detail::functor1<D, T, T, P>::call(fastSqrt, x);
+		return detail::functor1<L, T, T, P>::call(fastSqrt, x);
 	}
 
 	// fastInversesqrt
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastInverseSqrt(genType x)
 	{
 #		ifdef __CUDACC__ // Wordaround for a CUDA compiler bug up to CUDA6
@@ -30,14 +30,14 @@ namespace glm
 #		endif
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastInverseSqrt(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastInverseSqrt(vecType<L, T, P> const & x)
 	{
-		return detail::compute_inversesqrt<D, T, P, detail::is_aligned<P>::value>::call(x);
+		return detail::compute_inversesqrt<L, T, P, detail::is_aligned<P>::value>::call(x);
 	}
 
 	// fastLength
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastLength(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fastLength' only accept floating-point inputs");
@@ -45,8 +45,8 @@ namespace glm
 		return abs(x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T fastLength(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER T fastLength(vecType<L, T, P> const & x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'fastLength' only accept floating-point inputs");
 
@@ -54,27 +54,27 @@ namespace glm
 	}
 
 	// fastDistance
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastDistance(genType x, genType y)
 	{
 		return fastLength(y - x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T fastDistance(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER T fastDistance(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 	{
 		return fastLength(y - x);
 	}
 
 	// fastNormalize
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastNormalize(genType x)
 	{
 		return x > genType(0) ? genType(1) : -genType(1);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastNormalize(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastNormalize(vecType<L, T, P> const & x)
 	{
 		return x * fastInverseSqrt(dot(x, x));
 	}
diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp
index 1a1dc6e1..d78de725 100644
--- a/glm/gtx/fast_trigonometry.hpp
+++ b/glm/gtx/fast_trigonometry.hpp
@@ -30,47 +30,47 @@ namespace glm
 
 	/// Wrap an angle to [0 2pi[
 	/// From GLM_GTX_fast_trigonometry extension.
-	template <typename T> 
+	template<typename T> 
 	GLM_FUNC_DECL T wrapAngle(T angle);
 
 	/// Faster than the common sin function but less accurate.
 	/// From GLM_GTX_fast_trigonometry extension.
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T fastSin(T angle);
 
 	/// Faster than the common cos function but less accurate.
 	/// From GLM_GTX_fast_trigonometry extension.
-	template <typename T> 
+	template<typename T> 
 	GLM_FUNC_DECL T fastCos(T angle);
 
 	/// Faster than the common tan function but less accurate. 
 	/// Defined between -2pi and 2pi. 
 	/// From GLM_GTX_fast_trigonometry extension.
-	template <typename T> 
+	template<typename T> 
 	GLM_FUNC_DECL T fastTan(T angle);
 
 	/// Faster than the common asin function but less accurate. 
 	/// Defined between -2pi and 2pi.
 	/// From GLM_GTX_fast_trigonometry extension.
-	template <typename T> 
+	template<typename T> 
 	GLM_FUNC_DECL T fastAsin(T angle);
 
 	/// Faster than the common acos function but less accurate. 
 	/// Defined between -2pi and 2pi. 
 	/// From GLM_GTX_fast_trigonometry extension.
-	template <typename T> 
+	template<typename T> 
 	GLM_FUNC_DECL T fastAcos(T angle);
 
 	/// Faster than the common atan function but less accurate.
 	/// Defined between -2pi and 2pi. 
 	/// From GLM_GTX_fast_trigonometry extension.
-	template <typename T> 
+	template<typename T> 
 	GLM_FUNC_DECL T fastAtan(T y, T x);
 
 	/// Faster than the common atan function but less accurate. 
 	/// Defined between -2pi and 2pi.
 	/// From GLM_GTX_fast_trigonometry extension.
-	template <typename T> 
+	template<typename T> 
 	GLM_FUNC_DECL T fastAtan(T angle);
 
 	/// @}
diff --git a/glm/gtx/fast_trigonometry.inl b/glm/gtx/fast_trigonometry.inl
index ee9a9d1a..200c371b 100644
--- a/glm/gtx/fast_trigonometry.inl
+++ b/glm/gtx/fast_trigonometry.inl
@@ -4,8 +4,8 @@
 namespace glm{
 namespace detail
 {
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> taylorCos(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> taylorCos(vecType<L, T, P> const & x)
 	{
 		return static_cast<T>(1)
 			- (x * x) * (1.f / 2.f)
@@ -14,35 +14,35 @@ namespace detail
 			+ (((x * x) * (x * x)) * ((x * x) * (x * x))) * (1.f / 40320.f);
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T cos_52s(T x)
 	{
 		T const xx(x * x);
 		return (T(0.9999932946) + xx * (T(-0.4999124376) + xx * (T(0.0414877472) + xx * T(-0.0012712095))));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> cos_52s(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> cos_52s(vecType<L, T, P> const & x)
 	{
-		return detail::functor1<D, T, T, P>::call(cos_52s, x);
+		return detail::functor1<L, T, T, P>::call(cos_52s, x);
 	}
 }//namespace detail
 
 	// wrapAngle
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T wrapAngle(T angle)
 	{
 		return abs<T>(mod<T>(angle, two_pi<T>()));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> wrapAngle(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> wrapAngle(vecType<L, T, P> const & x)
 	{
-		return detail::functor1<D, T, T, P>::call(wrapAngle, x);
+		return detail::functor1<L, T, T, P>::call(wrapAngle, x);
 	}
 
 	// cos
-	template <typename T> 
+	template<typename T> 
 	GLM_FUNC_QUALIFIER T fastCos(T x)
 	{
 		T const angle(wrapAngle<T>(x));
@@ -57,87 +57,87 @@ namespace detail
 		return detail::cos_52s(two_pi<T>() - angle);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastCos(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastCos(vecType<L, T, P> const & x)
 	{
-		return detail::functor1<D, T, T, P>::call(fastCos, x);
+		return detail::functor1<L, T, T, P>::call(fastCos, x);
 	}
 
 	// sin
-	template <typename T> 
+	template<typename T> 
 	GLM_FUNC_QUALIFIER T fastSin(T x)
 	{
 		return fastCos<T>(half_pi<T>() - x);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastSin(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastSin(vecType<L, T, P> const & x)
 	{
-		return detail::functor1<D, T, T, P>::call(fastSin, x);
+		return detail::functor1<L, T, T, P>::call(fastSin, x);
 	}
 
 	// tan
-	template <typename T> 
+	template<typename T> 
 	GLM_FUNC_QUALIFIER T fastTan(T x)
 	{
 		return x + (x * x * x * T(0.3333333333)) + (x * x * x * x * x * T(0.1333333333333)) + (x * x * x * x * x * x * x * T(0.0539682539));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastTan(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastTan(vecType<L, T, P> const & x)
 	{
-		return detail::functor1<D, T, T, P>::call(fastTan, x);
+		return detail::functor1<L, T, T, P>::call(fastTan, x);
 	}
 
 	// asin
-	template <typename T> 
+	template<typename T> 
 	GLM_FUNC_QUALIFIER T fastAsin(T x)
 	{
 		return x + (x * x * x * T(0.166666667)) + (x * x * x * x * x * T(0.075)) + (x * x * x * x * x * x * x * T(0.0446428571)) + (x * x * x * x * x * x * x * x * x * T(0.0303819444));// + (x * x * x * x * x * x * x * x * x * x * x * T(0.022372159));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastAsin(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastAsin(vecType<L, T, P> const & x)
 	{
-		return detail::functor1<D, T, T, P>::call(fastAsin, x);
+		return detail::functor1<L, T, T, P>::call(fastAsin, x);
 	}
 
 	// acos
-	template <typename T> 
+	template<typename T> 
 	GLM_FUNC_QUALIFIER T fastAcos(T x)
 	{
 		return T(1.5707963267948966192313216916398) - fastAsin(x); //(PI / 2)
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastAcos(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastAcos(vecType<L, T, P> const & x)
 	{
-		return detail::functor1<D, T, T, P>::call(fastAcos, x);
+		return detail::functor1<L, T, T, P>::call(fastAcos, x);
 	}
 
 	// atan
-	template <typename T> 
+	template<typename T> 
 	GLM_FUNC_QUALIFIER T fastAtan(T y, T x)
 	{
 		T sgn = sign(y) * sign(x);
 		return abs(fastAtan(y / x)) * sgn;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastAtan(vecType<D, T, P> const & y, vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastAtan(vecType<L, T, P> const & y, vecType<L, T, P> const & x)
 	{
-		return detail::functor2<D, T, P>::call(fastAtan, y, x);
+		return detail::functor2<L, T, P>::call(fastAtan, y, x);
 	}
 
-	template <typename T> 
+	template<typename T> 
 	GLM_FUNC_QUALIFIER T fastAtan(T x)
 	{
 		return x - (x * x * x * T(0.333333333333)) + (x * x * x * x * x * T(0.2)) - (x * x * x * x * x * x * x * T(0.1428571429)) + (x * x * x * x * x * x * x * x * x * T(0.111111111111)) - (x * x * x * x * x * x * x * x * x * x * x * T(0.0909090909));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastAtan(vecType<D, T, P> const & x)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastAtan(vecType<L, T, P> const & x)
 	{
-		return detail::functor1<D, T, T, P>::call(fastAtan, x);
+		return detail::functor1<L, T, T, P>::call(fastAtan, x);
 	}
 }//namespace glm
diff --git a/glm/gtx/float_notmalize.inl b/glm/gtx/float_notmalize.inl
index 5b63e233..665e2fbd 100644
--- a/glm/gtx/float_notmalize.inl
+++ b/glm/gtx/float_notmalize.inl
@@ -5,10 +5,10 @@
 
 namespace glm
 {
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, float, P> floatNormalize(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, float, P> floatNormalize(vecType<L, T, P> const & v)
 	{
-		return vecType<D, float, P>(v) / static_cast<float>(std::numeric_limits<T>::max());
+		return vecType<L, float, P>(v) / static_cast<float>(std::numeric_limits<T>::max());
 	}
 
 }//namespace glm
diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp
index 0afd276f..50a930dd 100644
--- a/glm/gtx/gradient_paint.hpp
+++ b/glm/gtx/gradient_paint.hpp
@@ -31,7 +31,7 @@ namespace glm
 
 	/// Return a color from a radial gradient.
 	/// @see - gtx_gradient_paint
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T radialGradient(
 		vec<2, T, P> const & Center,
 		T const & Radius,
@@ -40,7 +40,7 @@ namespace glm
 
 	/// Return a color from a linear gradient.
 	/// @see - gtx_gradient_paint
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T linearGradient(
 		vec<2, T, P> const & Point0,
 		vec<2, T, P> const & Point1,
diff --git a/glm/gtx/gradient_paint.inl b/glm/gtx/gradient_paint.inl
index 759cce5c..ef8b7e4e 100644
--- a/glm/gtx/gradient_paint.inl
+++ b/glm/gtx/gradient_paint.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T radialGradient
 	(
 		vec<2, T, P> const & Center,
@@ -23,7 +23,7 @@ namespace glm
 		return Numerator / Denominator;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T linearGradient
 	(
 		vec<2, T, P> const & Point0,
diff --git a/glm/gtx/handed_coordinate_space.hpp b/glm/gtx/handed_coordinate_space.hpp
index 8f29d313..61491940 100644
--- a/glm/gtx/handed_coordinate_space.hpp
+++ b/glm/gtx/handed_coordinate_space.hpp
@@ -30,7 +30,7 @@ namespace glm
 
 	//! Return if a trihedron right handed or not.
 	//! From GLM_GTX_handed_coordinate_space extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool rightHanded(
 		vec<3, T, P> const & tangent,
 		vec<3, T, P> const & binormal,
@@ -38,7 +38,7 @@ namespace glm
 
 	//! Return if a trihedron left handed or not.
 	//! From GLM_GTX_handed_coordinate_space extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool leftHanded(
 		vec<3, T, P> const & tangent,
 		vec<3, T, P> const & binormal,
diff --git a/glm/gtx/handed_coordinate_space.inl b/glm/gtx/handed_coordinate_space.inl
index 0f3b548f..d95fcd08 100644
--- a/glm/gtx/handed_coordinate_space.inl
+++ b/glm/gtx/handed_coordinate_space.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool rightHanded
 	(
 		vec<3, T, P> const & tangent,
@@ -14,7 +14,7 @@ namespace glm
 		return dot(cross(normal, tangent), binormal) > T(0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool leftHanded
 	(
 		vec<3, T, P> const & tangent,
diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp
index f033809f..d457e99a 100644
--- a/glm/gtx/hash.hpp
+++ b/glm/gtx/hash.hpp
@@ -44,91 +44,91 @@
 
 namespace std
 {
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	struct hash<glm::vec<1, T,P> >
 	{
 		GLM_FUNC_DECL size_t operator()(glm::vec<1, T, P> const & v) const;
 	};
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	struct hash<glm::vec<2, T,P> >
 	{
 		GLM_FUNC_DECL size_t operator()(glm::vec<2, T, P> const & v) const;
 	};
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	struct hash<glm::vec<3, T,P> >
 	{
 		GLM_FUNC_DECL size_t operator()(glm::vec<3, T, P> const & v) const;
 	};
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	struct hash<glm::vec<4, T,P> >
 	{
 		GLM_FUNC_DECL size_t operator()(glm::vec<4, T, P> const & v) const;
 	};
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	struct hash<glm::tquat<T,P>>
 	{
 		GLM_FUNC_DECL size_t operator()(glm::tquat<T, P> const & q) const;
 	};
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	struct hash<glm::tdualquat<T,P> >
 	{
 		GLM_FUNC_DECL size_t operator()(glm::tdualquat<T,P> const & q) const;
 	};
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	struct hash<glm::mat<2, 2, T,P> >
 	{
 		GLM_FUNC_DECL size_t operator()(glm::mat<2, 2, T,P> const & m) const;
 	};
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	struct hash<glm::mat<2, 3, T,P> >
 	{
 		GLM_FUNC_DECL size_t operator()(glm::mat<2, 3, T,P> const & m) const;
 	};
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	struct hash<glm::mat<2, 4, T,P> >
 	{
 		GLM_FUNC_DECL size_t operator()(glm::mat<2, 4, T,P> const & m) const;
 	};
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	struct hash<glm::mat<3, 2, T,P> >
 	{
 		GLM_FUNC_DECL size_t operator()(glm::mat<3, 2, T,P> const & m) const;
 	};
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	struct hash<glm::mat<3, 3, T,P> >
 	{
 		GLM_FUNC_DECL size_t operator()(glm::mat<3, 3, T,P> const & m) const;
 	};
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	struct hash<glm::mat<3, 4, T,P> >
 	{
 		GLM_FUNC_DECL size_t operator()(glm::mat<3, 4, T,P> const & m) const;
 	};
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	struct hash<glm::mat<4, 2, T,P> >
 	{
 		GLM_FUNC_DECL size_t operator()(glm::mat<4, 2, T,P> const & m) const;
 	};
 	
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	struct hash<glm::mat<4, 3, T,P> >
 	{
 		GLM_FUNC_DECL size_t operator()(glm::mat<4, 3, T,P> const & m) const;
 	};
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	struct hash<glm::mat<4, 4, T,P> >
 	{
 		GLM_FUNC_DECL size_t operator()(glm::mat<4, 4, T,P> const & m) const;
diff --git a/glm/gtx/hash.inl b/glm/gtx/hash.inl
index f7e13f54..1e1e72ff 100644
--- a/glm/gtx/hash.inl
+++ b/glm/gtx/hash.inl
@@ -22,14 +22,14 @@ namespace detail
 
 namespace std
 {
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	GLM_FUNC_QUALIFIER size_t hash<glm::vec<1, T, P>>::operator()(glm::vec<1, T, P> const & v) const
 	{
 		hash<T> hasher;
 		return hasher(v.x);
 	}
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	GLM_FUNC_QUALIFIER size_t hash<glm::vec<2, T, P>>::operator()(glm::vec<2, T, P> const & v) const
 	{
 		size_t seed = 0;
@@ -39,7 +39,7 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	GLM_FUNC_QUALIFIER size_t hash<glm::vec<3, T, P>>::operator()(glm::vec<3, T, P> const & v) const
 	{
 		size_t seed = 0;
@@ -50,7 +50,7 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	GLM_FUNC_QUALIFIER size_t hash<glm::vec<4, T, P>>::operator()(glm::vec<4, T, P> const & v) const
 	{
 		size_t seed = 0;
@@ -62,7 +62,7 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	GLM_FUNC_QUALIFIER size_t hash<glm::tquat<T, P>>::operator()(glm::tquat<T,P> const & q) const
 	{
 		size_t seed = 0;
@@ -74,7 +74,7 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	GLM_FUNC_QUALIFIER size_t hash<glm::tdualquat<T, P>>::operator()(glm::tdualquat<T, P> const & q) const
 	{
 		size_t seed = 0;
@@ -84,7 +84,7 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<2, 2, T, P>>::operator()(glm::mat<2, 2, T, P> const& m) const
 	{
 		size_t seed = 0;
@@ -94,7 +94,7 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<2, 3, T, P>>::operator()(glm::mat<2, 3, T, P> const& m) const
 	{
 		size_t seed = 0;
@@ -104,7 +104,7 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<2, 4, T, P>>::operator()(glm::mat<2, 4, T, P> const& m) const
 	{
 		size_t seed = 0;
@@ -114,7 +114,7 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<3, 2, T, P>>::operator()(glm::mat<3, 2, T, P> const& m) const
 	{
 		size_t seed = 0;
@@ -125,7 +125,7 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<3, 3, T, P>>::operator()(glm::mat<3, 3, T, P> const& m) const
 	{
 		size_t seed = 0;
@@ -136,7 +136,7 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<3, 4, T, P>>::operator()(glm::mat<3, 4, T, P> const& m) const
 	{
 		size_t seed = 0;
@@ -147,7 +147,7 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<4, 2, T,P>>::operator()(glm::mat<4, 2, T,P> const & m) const
 	{
 		size_t seed = 0;
@@ -159,7 +159,7 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<4, 3, T,P>>::operator()(glm::mat<4, 3, T,P> const & m) const
 	{
 		size_t seed = 0;
@@ -171,7 +171,7 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
+	template<typename T, glm::precision P>
 	GLM_FUNC_QUALIFIER size_t hash<glm::mat<4, 4, T,P>>::operator()(glm::mat<4, 4, T, P> const& m) const
 	{
 		size_t seed = 0;
diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp
index da6b8fe2..d96b3d82 100644
--- a/glm/gtx/integer.hpp
+++ b/glm/gtx/integer.hpp
@@ -47,7 +47,7 @@ namespace glm
 
 	//! Return the factorial value of a number (!12 max, integer only)
 	//! From GLM_GTX_integer extension.
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_DECL genType factorial(genType const & x);
 
 	//! 32bit signed integer. 
diff --git a/glm/gtx/integer.inl b/glm/gtx/integer.inl
index 84730c2c..bddfd2ca 100644
--- a/glm/gtx/integer.inl
+++ b/glm/gtx/integer.inl
@@ -69,7 +69,7 @@ namespace detail
 	}
 
 	// factorial (!12 max, integer only)
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType factorial(genType const & x)
 	{
 		genType Temp = x;
@@ -79,7 +79,7 @@ namespace detail
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> factorial(
 		vec<2, T, P> const & x)
 	{
@@ -88,7 +88,7 @@ namespace detail
 			factorial(x.y));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> factorial(
 		vec<3, T, P> const & x)
 	{
@@ -98,7 +98,7 @@ namespace detail
 			factorial(x.z));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> factorial(
 		vec<4, T, P> const & x)
 	{
diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp
index 429c108f..a6a78633 100644
--- a/glm/gtx/intersect.hpp
+++ b/glm/gtx/intersect.hpp
@@ -37,7 +37,7 @@ namespace glm
 	//! Compute the intersection of a ray and a plane.
 	//! Ray direction and plane normal must be unit length.
 	//! From GLM_GTX_intersect extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL bool intersectRayPlane(
 		genType const & orig, genType const & dir,
 		genType const & planeOrig, genType const & planeNormal,
@@ -46,7 +46,7 @@ namespace glm
 	//! Compute the intersection of a ray and a triangle.
 	/// Based om Tomas Möller implementation http://fileadmin.cs.lth.se/cs/Personal/Tomas_Akenine-Moller/raytri/
 	//! From GLM_GTX_intersect extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool intersectRayTriangle(
 		vec<3, T, P> const& orig, vec<3, T, P> const& dir,
 		vec<3, T, P> const& v0, vec<3, T, P> const& v1, vec<3, T, P> const& v2,
@@ -54,7 +54,7 @@ namespace glm
 
 	//! Compute the intersection of a line and a triangle.
 	//! From GLM_GTX_intersect extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL bool intersectLineTriangle(
 		genType const & orig, genType const & dir,
 		genType const & vert0, genType const & vert1, genType const & vert2,
@@ -63,7 +63,7 @@ namespace glm
 	//! Compute the intersection distance of a ray and a sphere. 
 	//! The ray direction vector is unit length.
 	//! From GLM_GTX_intersect extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL bool intersectRaySphere(
 		genType const & rayStarting, genType const & rayNormalizedDirection,
 		genType const & sphereCenter, typename genType::value_type const sphereRadiusSquered,
@@ -71,7 +71,7 @@ namespace glm
 
 	//! Compute the intersection of a ray and a sphere.
 	//! From GLM_GTX_intersect extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL bool intersectRaySphere(
 		genType const & rayStarting, genType const & rayNormalizedDirection,
 		genType const & sphereCenter, const typename genType::value_type sphereRadius,
@@ -79,7 +79,7 @@ namespace glm
 
 	//! Compute the intersection of a line and a sphere.
 	//! From GLM_GTX_intersect extension
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL bool intersectLineSphere(
 		genType const & point0, genType const & point1,
 		genType const & sphereCenter, typename genType::value_type sphereRadius,
diff --git a/glm/gtx/intersect.inl b/glm/gtx/intersect.inl
index e1cea2d4..b97b073e 100644
--- a/glm/gtx/intersect.inl
+++ b/glm/gtx/intersect.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER bool intersectRayPlane
 	(
 		genType const & orig, genType const & dir,
@@ -23,7 +23,7 @@ namespace glm
 		return false;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool intersectRayTriangle
 	(
 		vec<3, T, P> const& orig, vec<3, T, P> const& dir,
@@ -118,7 +118,7 @@ namespace glm
 	}
 */
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER bool intersectLineTriangle
 	(
 		genType const & orig, genType const & dir,
@@ -156,7 +156,7 @@ namespace glm
 		return true;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER bool intersectRaySphere
 	(
 		genType const & rayStarting, genType const & rayNormalizedDirection,
@@ -177,7 +177,7 @@ namespace glm
 		return intersectionDistance > Epsilon;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER bool intersectRaySphere
 	(
 		genType const & rayStarting, genType const & rayNormalizedDirection,
@@ -195,7 +195,7 @@ namespace glm
 		return false;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER bool intersectLineSphere
 	(
 		genType const & point0, genType const & point1,
diff --git a/glm/gtx/io.hpp b/glm/gtx/io.hpp
index 932ccaa8..c1a2d274 100644
--- a/glm/gtx/io.hpp
+++ b/glm/gtx/io.hpp
@@ -44,7 +44,7 @@ namespace glm
 	{
 		enum order_type { column_major, row_major};
 
-		template <typename CTy>
+		template<typename CTy>
 		class format_punct : public std::locale::facet
 		{
 			typedef CTy char_type;
@@ -67,7 +67,7 @@ namespace glm
 			GLM_FUNC_DECL explicit format_punct(format_punct const&);
 		};
 
-		template <typename CTy, typename CTr = std::char_traits<CTy> >
+		template<typename CTy, typename CTr = std::char_traits<CTy> >
 		class basic_state_saver {
 
 		public:
@@ -96,7 +96,7 @@ namespace glm
 		typedef basic_state_saver<char>     state_saver;
 		typedef basic_state_saver<wchar_t> wstate_saver;
 
-		template <typename CTy, typename CTr = std::char_traits<CTy> >
+		template<typename CTy, typename CTr = std::char_traits<CTy> >
 		class basic_format_saver
 		{
 		public:
@@ -128,7 +128,7 @@ namespace glm
 			GLM_FUNC_DECL explicit width(unsigned);
 		};
 
-		template <typename CTy>
+		template<typename CTy>
 		struct delimeter
 		{
 			CTy value[3];
@@ -145,53 +145,53 @@ namespace glm
 
 		// functions, inlined (inline)
 
-		template <typename FTy, typename CTy, typename CTr>
+		template<typename FTy, typename CTy, typename CTr>
 		FTy const& get_facet(std::basic_ios<CTy,CTr>&);
-		template <typename FTy, typename CTy, typename CTr>
+		template<typename FTy, typename CTy, typename CTr>
 		std::basic_ios<CTy,CTr>& formatted(std::basic_ios<CTy,CTr>&);
-		template <typename FTy, typename CTy, typename CTr>
+		template<typename FTy, typename CTy, typename CTr>
 		std::basic_ios<CTy,CTr>& unformattet(std::basic_ios<CTy,CTr>&);
 
-		template <typename CTy, typename CTr>
+		template<typename CTy, typename CTr>
 		std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, precision const&);
-		template <typename CTy, typename CTr>
+		template<typename CTy, typename CTr>
 		std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, width const&);
-		template <typename CTy, typename CTr>
+		template<typename CTy, typename CTr>
 		std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, delimeter<CTy> const&);
-		template <typename CTy, typename CTr>
+		template<typename CTy, typename CTr>
 		std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, order const&);
 	}//namespace io
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tquat<T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, vec<1, T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, vec<2, T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, vec<3, T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, vec<4, T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<2, 2, T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<2, 3, T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<2, 4, T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<3, 2, T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<3, 3, T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<3, 4, T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<4, 2, T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<4, 3, T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<4, 4, T,P> const&);
 
-  template <typename CTy, typename CTr, typename T, precision P>
+  template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr> &,
                                                          std::pair<mat<4, 4, T,P> const, mat<4, 4, T,P> const> const &);
 
diff --git a/glm/gtx/io.inl b/glm/gtx/io.inl
index 8eb768b8..9735cd15 100644
--- a/glm/gtx/io.inl
+++ b/glm/gtx/io.inl
@@ -10,7 +10,7 @@
 namespace glm{
 namespace io
 {
-	template <typename CTy>
+	template<typename CTy>
 	GLM_FUNC_QUALIFIER format_punct<CTy>::format_punct(size_t a)
 		: std::locale::facet(a)
 		, formatted(true)
@@ -24,7 +24,7 @@ namespace io
 		, order(column_major)
 	{}
 
-	template <typename CTy>
+	template<typename CTy>
 	GLM_FUNC_QUALIFIER format_punct<CTy>::format_punct(format_punct const& a)
 		: std::locale::facet(0)
 		, formatted(a.formatted)
@@ -38,9 +38,9 @@ namespace io
 		, order(a.order)
 	{}
 
-	template <typename CTy> std::locale::id format_punct<CTy>::id;
+	template<typename CTy> std::locale::id format_punct<CTy>::id;
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER basic_state_saver<CTy, CTr>::basic_state_saver(std::basic_ios<CTy, CTr>& a)
 		: state_(a)
 		, flags_(a.flags())
@@ -50,7 +50,7 @@ namespace io
 		, locale_(a.getloc())
 	{}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER basic_state_saver<CTy, CTr>::~basic_state_saver()
 	{
 		state_.imbue(locale_);
@@ -60,14 +60,14 @@ namespace io
 		state_.flags(flags_);
 	}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER basic_format_saver<CTy, CTr>::basic_format_saver(std::basic_ios<CTy, CTr>& a)
 		: bss_(a)
 	{
 		a.imbue(std::locale(a.getloc(), new format_punct<CTy>(get_facet<format_punct<CTy> >(a))));
 	}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER
 	basic_format_saver<CTy, CTr>::~basic_format_saver()
 	{}
@@ -80,7 +80,7 @@ namespace io
 		: value(a)
 	{}
 
-	template <typename CTy>
+	template<typename CTy>
 	GLM_FUNC_QUALIFIER delimeter<CTy>::delimeter(CTy a, CTy b, CTy c)
 		: value()
 	{
@@ -93,7 +93,7 @@ namespace io
 		: value(a)
 	{}
 
-	template <typename FTy, typename CTy, typename CTr>
+	template<typename FTy, typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER FTy const& get_facet(std::basic_ios<CTy, CTr>& ios)
 	{
 		if(!std::has_facet<FTy>(ios.getloc()))
@@ -102,35 +102,35 @@ namespace io
 		return std::use_facet<FTy>(ios.getloc());
 	}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER std::basic_ios<CTy, CTr>& formatted(std::basic_ios<CTy, CTr>& ios)
 	{
 		const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(ios)).formatted = true;
 		return ios;
 	}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER std::basic_ios<CTy, CTr>& unformatted(std::basic_ios<CTy, CTr>& ios)
 	{
 		const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(ios)).formatted = false;
 		return ios;
 	}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, precision const& a)
 	{
 		const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).precision = a.value;
 		return os;
 	}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, width const& a)
 	{
 		const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).width = a.value;
 		return os;
 	}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER  std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, delimeter<CTy> const& a)
 	{
 		format_punct<CTy> & fmt(const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)));
@@ -142,7 +142,7 @@ namespace io
 		return os;
 	}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, order const& a)
 	{
 		const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).order = a.value;
@@ -152,7 +152,7 @@ namespace io
 
 namespace detail
 {
-	template <typename CTy, typename CTr, typename V>
+	template<typename CTy, typename CTr, typename V>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>&
 	print_vector_on(std::basic_ostream<CTy, CTr>& os, V const& a)
 	{
@@ -195,31 +195,31 @@ namespace detail
 	}
 }//namespace detail
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tquat<T,P> const& a)
 	{
 		return detail::print_vector_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, vec<1, T,P> const& a)
 	{
 		return detail::print_vector_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, vec<2, T,P> const& a)
 	{
 		return detail::print_vector_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, vec<3, T,P> const& a)
 	{
 		return detail::print_vector_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, vec<4, T,P> const& a)
 	{
 		return detail::print_vector_on(os, a);
@@ -227,7 +227,7 @@ namespace detail
 
 namespace detail
 {
-	template <typename CTy, typename CTr, template <length_t, length_t, typename, precision> class M, length_t C, length_t R, typename T, precision P>
+	template<typename CTy, typename CTr, template<length_t, length_t, typename, precision> class M, length_t C, length_t R, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& print_matrix_on(std::basic_ostream<CTy, CTr>& os, M<C, R, T, P> const& a)
 	{
 		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
@@ -313,55 +313,55 @@ namespace detail
 	}
 }//namespace detail
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, mat<2, 2, T, P> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, mat<2, 3, T, P> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, mat<2, 4, T, P> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, mat<3, 2, T,P> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, mat<3, 3, T,P> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, mat<3, 4, T,P> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, mat<4, 2, T,P> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, mat<4, 3, T,P> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, mat<4, 4, T,P> const& a)
 	{
 		return detail::print_matrix_on(os, a);
@@ -369,7 +369,7 @@ namespace detail
 
 namespace detail
 {
-	template <typename CTy, typename CTr, template <length_t, length_t, typename, precision> class M, length_t C, length_t R, typename T, precision P>
+	template<typename CTy, typename CTr, template<length_t, length_t, typename, precision> class M, length_t C, length_t R, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& print_matrix_pair_on(std::basic_ostream<CTy, CTr>& os, std::pair<M<C, R, T, P> const, M<C, R, T, P> const> const& a)
 	{
 		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
@@ -430,7 +430,7 @@ namespace detail
 	}
 }//namespace detail
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, precision P>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(
 		std::basic_ostream<CTy, CTr> & os,
 		std::pair<mat<4, 4, T, P> const,
diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp
index 3f4da134..577c7914 100644
--- a/glm/gtx/log_base.hpp
+++ b/glm/gtx/log_base.hpp
@@ -30,17 +30,17 @@ namespace glm
 
 	/// Logarithm for any base.
 	/// From GLM_GTX_log_base.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType log(
 		genType const & x,
 		genType const & base);
 
 	/// Logarithm for any base.
 	/// From GLM_GTX_log_base.
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, T, P> sign(
-		vecType<D, T, P> const & x,
-		vecType<D, T, P> const & base);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, T, P> sign(
+		vecType<L, T, P> const& x,
+		vecType<L, T, P> const& base);
 
 	/// @}
 }//namespace glm
diff --git a/glm/gtx/log_base.inl b/glm/gtx/log_base.inl
index 2d3e7d9d..9155778a 100644
--- a/glm/gtx/log_base.inl
+++ b/glm/gtx/log_base.inl
@@ -3,15 +3,15 @@
 
 namespace glm
 {
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_QUALIFIER genType log(genType const & x, genType const & base)
 	{
 		assert(x != genType(0));
 		return glm::log(x) / glm::log(base);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> log(vecType<D, T, P> const & x, vecType<D, T, P> const & base)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> log(vecType<L, T, P> const & x, vecType<L, T, P> const & base)
 	{
 		return glm::log(x) / glm::log(base);
 	}
diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp
index 12e71f43..0b1bb48e 100644
--- a/glm/gtx/matrix_cross_product.hpp
+++ b/glm/gtx/matrix_cross_product.hpp
@@ -31,13 +31,13 @@ namespace glm
 
 	//! Build a cross product matrix.
 	//! From GLM_GTX_matrix_cross_product extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> matrixCross3(
 		vec<3, T, P> const & x);
 		
 	//! Build a cross product matrix.
 	//! From GLM_GTX_matrix_cross_product extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> matrixCross4(
 		vec<3, T, P> const & x);
 
diff --git a/glm/gtx/matrix_cross_product.inl b/glm/gtx/matrix_cross_product.inl
index 896c3572..e1b2fe90 100644
--- a/glm/gtx/matrix_cross_product.inl
+++ b/glm/gtx/matrix_cross_product.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> matrixCross3
 	(
 		vec<3, T, P> const & x
@@ -19,7 +19,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> matrixCross4
 	(
 		vec<3, T, P> const & x
diff --git a/glm/gtx/matrix_decompose.hpp b/glm/gtx/matrix_decompose.hpp
index 6f56d404..5a9225ce 100644
--- a/glm/gtx/matrix_decompose.hpp
+++ b/glm/gtx/matrix_decompose.hpp
@@ -35,7 +35,7 @@ namespace glm
 
 	/// Decomposes a model matrix to translations, rotation and scale components 
 	/// @see gtx_matrix_decompose
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL bool decompose(
 		mat<4, 4, T, P> const& modelMatrix,
 		vec<3, T, P> & scale, tquat<T, P> & orientation, vec<3, T, P> & translation, vec<3, T, P> & skew, vec<4, T, P> & perspective);
diff --git a/glm/gtx/matrix_decompose.inl b/glm/gtx/matrix_decompose.inl
index 57f05b78..3cd58811 100644
--- a/glm/gtx/matrix_decompose.inl
+++ b/glm/gtx/matrix_decompose.inl
@@ -6,7 +6,7 @@ namespace detail
 {
 	/// Make a linear combination of two vectors and return the result.
 	// result = (a * ascl) + (b * bscl)
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> combine(
 		vec<3, T, P> const & a, 
 		vec<3, T, P> const & b,
@@ -15,7 +15,7 @@ namespace detail
 		return (a * ascl) + (b * bscl);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> scale(vec<3, T, P> const& v, T desiredLength)
 	{
 		return v * desiredLength / length(v);
@@ -26,7 +26,7 @@ namespace detail
 	// http://www.opensource.apple.com/source/WebCore/WebCore-514/platform/graphics/transforms/TransformationMatrix.cpp
 	// Decomposes the mode matrix to translations,rotation scale components
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER bool decompose(mat<4, 4, T, P> const & ModelMatrix, vec<3, T, P> & Scale, tquat<T, P> & Orientation, vec<3, T, P> & Translation, vec<3, T, P> & Skew, vec<4, T, P> & Perspective)
 	{
 		mat<4, 4, T, P> LocalMatrix(ModelMatrix);
diff --git a/glm/gtx/matrix_interpolation.hpp b/glm/gtx/matrix_interpolation.hpp
index 3104b11f..4e7f49dd 100644
--- a/glm/gtx/matrix_interpolation.hpp
+++ b/glm/gtx/matrix_interpolation.hpp
@@ -31,7 +31,7 @@ namespace glm
 
 	/// Get the axis and angle of the rotation from a matrix.
 	/// From GLM_GTX_matrix_interpolation extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL void axisAngle(
 		mat<4, 4, T, P> const& mat,
 		vec<3, T, P> & axis,
@@ -39,21 +39,21 @@ namespace glm
 
 	/// Build a matrix from axis and angle.
 	/// From GLM_GTX_matrix_interpolation extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> axisAngleMatrix(
 		vec<3, T, P> const & axis,
 		T const angle);
 
 	/// Extracts the rotation part of a matrix.
 	/// From GLM_GTX_matrix_interpolation extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> extractMatrixRotation(
 		mat<4, 4, T, P> const& mat);
 
 	/// Build a interpolation of 4 * 4 matrixes.
 	/// From GLM_GTX_matrix_interpolation extension.
 	/// Warning! works only with rotation and/or translation matrixes, scale will generate unexpected results.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> interpolate(
 		mat<4, 4, T, P> const& m1,
 		mat<4, 4, T, P> const& m2,
diff --git a/glm/gtx/matrix_interpolation.inl b/glm/gtx/matrix_interpolation.inl
index d54e5bcb..dd4e7d7d 100644
--- a/glm/gtx/matrix_interpolation.inl
+++ b/glm/gtx/matrix_interpolation.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER void axisAngle
 	(
 		mat<4, 4, T, P> const& mat,
@@ -78,7 +78,7 @@ namespace glm
 		axis.z = (mat[0][1] - mat[1][0]) / s;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> axisAngleMatrix
 	(
 		vec<3, T, P> const & axis,
@@ -98,7 +98,7 @@ namespace glm
 		);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> extractMatrixRotation
 	(
 		mat<4, 4, T, P> const& mat
@@ -112,7 +112,7 @@ namespace glm
 		);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> interpolate
 	(
 		mat<4, 4, T, P> const& m1,
diff --git a/glm/gtx/matrix_major_storage.hpp b/glm/gtx/matrix_major_storage.hpp
index 3dfad767..90f57967 100644
--- a/glm/gtx/matrix_major_storage.hpp
+++ b/glm/gtx/matrix_major_storage.hpp
@@ -31,20 +31,20 @@ namespace glm
 
 	//! Build a row major matrix from row vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> rowMajor2(
 		vec<2, T, P> const & v1, 
 		vec<2, T, P> const & v2);
 		
 	//! Build a row major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> rowMajor2(
 		mat<2, 2, T, P> const& m);
 
 	//! Build a row major matrix from row vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> rowMajor3(
 		vec<3, T, P> const & v1, 
 		vec<3, T, P> const & v2, 
@@ -52,13 +52,13 @@ namespace glm
 
 	//! Build a row major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> rowMajor3(
 		mat<3, 3, T, P> const& m);
 
 	//! Build a row major matrix from row vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> rowMajor4(
 		vec<4, T, P> const & v1, 
 		vec<4, T, P> const & v2,
@@ -67,26 +67,26 @@ namespace glm
 
 	//! Build a row major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> rowMajor4(
 		mat<4, 4, T, P> const& m);
 
 	//! Build a column major matrix from column vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> colMajor2(
 		vec<2, T, P> const & v1, 
 		vec<2, T, P> const & v2);
 		
 	//! Build a column major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> colMajor2(
 		mat<2, 2, T, P> const& m);
 
 	//! Build a column major matrix from column vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> colMajor3(
 		vec<3, T, P> const & v1, 
 		vec<3, T, P> const & v2, 
@@ -94,13 +94,13 @@ namespace glm
 		
 	//! Build a column major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> colMajor3(
 		mat<3, 3, T, P> const& m);
 		
 	//! Build a column major matrix from column vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> colMajor4(
 		vec<4, T, P> const & v1, 
 		vec<4, T, P> const & v2, 
@@ -109,7 +109,7 @@ namespace glm
 				
 	//! Build a column major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_DECL mat<4, 4, T, P> colMajor4(
 		mat<4, 4, T, P> const& m);
 
diff --git a/glm/gtx/matrix_major_storage.inl b/glm/gtx/matrix_major_storage.inl
index c4478fd9..6a21216f 100644
--- a/glm/gtx/matrix_major_storage.inl
+++ b/glm/gtx/matrix_major_storage.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> rowMajor2
 	(
 		vec<2, T, P> const & v1, 
@@ -18,7 +18,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> rowMajor2(
 		const mat<2, 2, T, P>& m)
 	{
@@ -30,7 +30,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> rowMajor3(
 		const vec<3, T, P>& v1, 
 		const vec<3, T, P>& v2, 
@@ -49,7 +49,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> rowMajor3(
 		const mat<3, 3, T, P>& m)
 	{
@@ -66,7 +66,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> rowMajor4(
 		const vec<4, T, P>& v1, 
 		const vec<4, T, P>& v2, 
@@ -93,7 +93,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> rowMajor4(
 		const mat<4, 4, T, P>& m)
 	{
@@ -117,7 +117,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> colMajor2(
 		const vec<2, T, P>& v1, 
 		const vec<2, T, P>& v2)
@@ -125,14 +125,14 @@ namespace glm
 		return mat<2, 2, T, P>(v1, v2);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> colMajor2(
 		const mat<2, 2, T, P>& m)
 	{
 		return mat<2, 2, T, P>(m);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> colMajor3(
 		const vec<3, T, P>& v1, 
 		const vec<3, T, P>& v2, 
@@ -141,14 +141,14 @@ namespace glm
 		return mat<3, 3, T, P>(v1, v2, v3);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> colMajor3(
 		const mat<3, 3, T, P>& m)
 	{
 		return mat<3, 3, T, P>(m);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> colMajor4(
 		const vec<4, T, P>& v1, 
 		const vec<4, T, P>& v2, 
@@ -158,7 +158,7 @@ namespace glm
 		return mat<4, 4, T, P>(v1, v2, v3, v4);
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> colMajor4(
 		const mat<4, 4, T, P>& m)
 	{
diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp
index 23de4dc1..853e27cf 100644
--- a/glm/gtx/matrix_operation.hpp
+++ b/glm/gtx/matrix_operation.hpp
@@ -30,55 +30,55 @@ namespace glm
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 2, T, P> diagonal2x2(
 		vec<2, T, P> const & v);
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 3, T, P> diagonal2x3(
 		vec<2, T, P> const & v);
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<2, 4, T, P> diagonal2x4(
 		vec<2, T, P> const & v);
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 2, T, P> diagonal3x2(
 		vec<2, T, P> const & v);
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> diagonal3x3(
 		vec<3, T, P> const & v);
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 4, T, P> diagonal3x4(
 		vec<3, T, P> const & v);
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 2, T, P> diagonal4x2(
 		vec<2, T, P> const & v);
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 3, T, P> diagonal4x3(
 		vec<3, T, P> const & v);
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> diagonal4x4(
 		vec<4, T, P> const & v);
 
diff --git a/glm/gtx/matrix_operation.inl b/glm/gtx/matrix_operation.inl
index c3943fd9..9816d52e 100644
--- a/glm/gtx/matrix_operation.inl
+++ b/glm/gtx/matrix_operation.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 2, T, P> diagonal2x2
 	(
 		vec<2, T, P> const & v
@@ -15,7 +15,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 3, T, P> diagonal2x3
 	(
 		vec<2, T, P> const & v
@@ -27,7 +27,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<2, 4, T, P> diagonal2x4
 	(
 		vec<2, T, P> const & v
@@ -39,7 +39,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 2, T, P> diagonal3x2
 	(
 		vec<2, T, P> const & v
@@ -51,7 +51,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> diagonal3x3
 	(
 		vec<3, T, P> const & v
@@ -64,7 +64,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 4, T, P> diagonal3x4
 	(
 		vec<3, T, P> const & v
@@ -77,7 +77,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> diagonal4x4
 	(
 		vec<4, T, P> const & v
@@ -91,7 +91,7 @@ namespace glm
 		return Result;		
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 3, T, P> diagonal4x3
 	(
 		vec<3, T, P> const & v
@@ -104,7 +104,7 @@ namespace glm
 		return Result;		
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 2, T, P> diagonal4x2
 	(
 		vec<2, T, P> const & v
diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp
index 92f12f67..f686e6d9 100644
--- a/glm/gtx/matrix_query.hpp
+++ b/glm/gtx/matrix_query.hpp
@@ -48,7 +48,7 @@ namespace glm
 			
 	/// Return whether a matrix is an identity matrix.
 	/// From GLM_GTX_matrix_query extension.
-	template<length_t C, length_t R, typename T, precision P, template <length_t, length_t, typename, precision> class matType>
+	template<length_t C, length_t R, typename T, precision P, template<length_t, length_t, typename, precision> class matType>
 	GLM_FUNC_DECL bool isIdentity(matType<C, R, T, P> const & m, T const & epsilon);
 
 	/// Return whether a matrix is a normalized matrix.
@@ -68,7 +68,7 @@ namespace glm
 
 	/// Return whether a matrix is an orthonormalized matrix.
 	/// From GLM_GTX_matrix_query extension.
-	template<length_t C, length_t R, typename T, precision P, template <length_t, length_t, typename, precision> class matType>
+	template<length_t C, length_t R, typename T, precision P, template<length_t, length_t, typename, precision> class matType>
 	GLM_FUNC_DECL bool isOrthogonal(matType<C, R, T, P> const & m, T const & epsilon);
 
 	/// @}
diff --git a/glm/gtx/matrix_query.inl b/glm/gtx/matrix_query.inl
index b7400656..89cc8a3f 100644
--- a/glm/gtx/matrix_query.inl
+++ b/glm/gtx/matrix_query.inl
@@ -30,7 +30,7 @@ namespace glm
 		return result;
 	}
 
-	template<length_t C, length_t R, typename T, precision P, template <length_t, length_t, typename, precision> class matType>
+	template<length_t C, length_t R, typename T, precision P, template<length_t, length_t, typename, precision> class matType>
 	GLM_FUNC_QUALIFIER bool isIdentity(matType<C, R, T, P> const & m, T const & epsilon)
 	{
 		bool result = true;
@@ -94,7 +94,7 @@ namespace glm
 		return result;
 	}
 
-	template<length_t C, length_t R, typename T, precision P, template <length_t, length_t, typename, precision> class matType>
+	template<length_t C, length_t R, typename T, precision P, template<length_t, length_t, typename, precision> class matType>
 	GLM_FUNC_QUALIFIER bool isOrthogonal(matType<C, R, T, P> const & m, T const & epsilon)
 	{
 		bool result(true);
diff --git a/glm/gtx/matrix_transform_2d.hpp b/glm/gtx/matrix_transform_2d.hpp
index bb71111a..a8be9bc1 100644
--- a/glm/gtx/matrix_transform_2d.hpp
+++ b/glm/gtx/matrix_transform_2d.hpp
@@ -34,7 +34,7 @@ namespace glm
 	///
 	/// @param m Input matrix multiplied by this translation matrix.
 	/// @param v Coordinates of a translation vector.		
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> translate(
 		mat<3, 3, T, P> const& m,
 		vec<2, T, P> const & v);
@@ -43,7 +43,7 @@ namespace glm
 	///
 	/// @param m Input matrix multiplied by this translation matrix.
 	/// @param angle Rotation angle expressed in radians if GLM_FORCE_RADIANS is defined or degrees otherwise.
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> rotate(
 		mat<3, 3, T, P> const& m,
 		T angle);
@@ -52,7 +52,7 @@ namespace glm
 	///
 	/// @param m Input matrix multiplied by this translation matrix.
 	/// @param v Coordinates of a scale vector.		
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> scale(
 		mat<3, 3, T, P> const& m,
 		vec<2, T, P> const & v);
@@ -61,7 +61,7 @@ namespace glm
 	///
 	/// @param m Input matrix multiplied by this translation matrix.
 	/// @param y Shear factor.
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> shearX(
 		mat<3, 3, T, P> const& m,
 		T y);
@@ -70,7 +70,7 @@ namespace glm
 	///
 	/// @param m Input matrix multiplied by this translation matrix.
 	/// @param x Shear factor.
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> shearY(
 		mat<3, 3, T, P> const& m,
 		T x);
diff --git a/glm/gtx/matrix_transform_2d.inl b/glm/gtx/matrix_transform_2d.inl
index 4ed6be1d..97ac720b 100644
--- a/glm/gtx/matrix_transform_2d.inl
+++ b/glm/gtx/matrix_transform_2d.inl
@@ -7,7 +7,7 @@
 namespace glm
 {
 	
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> translate(
 		mat<3, 3, T, P> const& m,
 		vec<2, T, P> const & v)
@@ -18,7 +18,7 @@ namespace glm
 	}
 
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> rotate(
 		mat<3, 3, T, P> const& m,
 		T angle)
@@ -34,7 +34,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> scale(
 		mat<3, 3, T, P> const& m,
 		vec<2, T, P> const & v)
@@ -46,7 +46,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> shearX(
 		mat<3, 3, T, P> const& m,
 		T y)
@@ -56,7 +56,7 @@ namespace glm
 		return m * Result;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> shearY(
 		mat<3, 3, T, P> const& m,
 		T x)
diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp
index 60bebef7..4d008939 100644
--- a/glm/gtx/mixed_product.hpp
+++ b/glm/gtx/mixed_product.hpp
@@ -29,7 +29,7 @@ namespace glm
 	/// @{
 
 	/// @brief Mixed product of 3 vectors (from GLM_GTX_mixed_product extension)
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_DECL T mixedProduct(
 		vec<3, T, P> const & v1, 
 		vec<3, T, P> const & v2, 
diff --git a/glm/gtx/mixed_product.inl b/glm/gtx/mixed_product.inl
index dcd6d33d..9fe088de 100644
--- a/glm/gtx/mixed_product.inl
+++ b/glm/gtx/mixed_product.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T mixedProduct
 	(
 		vec<3, T, P> const & v1,
diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp
index 43732633..729e885a 100644
--- a/glm/gtx/norm.hpp
+++ b/glm/gtx/norm.hpp
@@ -32,46 +32,46 @@ namespace glm
 
 	/// Returns the squared length of x.
 	/// From GLM_GTX_norm extension.
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_DECL T length2(
-		vecType<D, T, P> const & x);
+		vecType<L, T, P> const& x);
 
 	/// Returns the squared distance between p0 and p1, i.e., length2(p0 - p1).
 	/// From GLM_GTX_norm extension.
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_DECL T distance2(
-		vecType<D, T, P> const & p0,
-		vecType<D, T, P> const & p1);
+		vecType<L, T, P> const& p0,
+		vecType<L, T, P> const& p1);
 
 	//! Returns the L1 norm between x and y.
 	//! From GLM_GTX_norm extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T l1Norm(
 		vec<3, T, P> const & x,
 		vec<3, T, P> const & y);
 		
 	//! Returns the L1 norm of v.
 	//! From GLM_GTX_norm extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T l1Norm(
 		vec<3, T, P> const & v);
 		
 	//! Returns the L2 norm between x and y.
 	//! From GLM_GTX_norm extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T l2Norm(
 		vec<3, T, P> const & x,
 		vec<3, T, P> const & y);
 		
 	//! Returns the L2 norm of v.
 	//! From GLM_GTX_norm extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T l2Norm(
 		vec<3, T, P> const & x);
 		
 	//! Returns the L norm between x and y.
 	//! From GLM_GTX_norm extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T lxNorm(
 		vec<3, T, P> const & x,
 		vec<3, T, P> const & y,
@@ -79,7 +79,7 @@ namespace glm
 
 	//! Returns the L norm of v.
 	//! From GLM_GTX_norm extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T lxNorm(
 		vec<3, T, P> const & x,
 		unsigned int Depth);
diff --git a/glm/gtx/norm.inl b/glm/gtx/norm.inl
index a3cc54c3..49b6a008 100644
--- a/glm/gtx/norm.inl
+++ b/glm/gtx/norm.inl
@@ -6,45 +6,45 @@
 namespace glm{
 namespace detail
 {
-	template <template <int, typename, precision> class vecType, int D, typename T, precision P, bool Aligned>
+	template<template<length_t, typename, precision> class vecType, length_t L, typename T, precision P, bool Aligned>
 	struct compute_length2
 	{
-		GLM_FUNC_QUALIFIER static T call(vecType<D, T, P> const & v)
+		GLM_FUNC_QUALIFIER static T call(vecType<L, T, P> const & v)
 		{
 			return dot(v, v);
 		}
 	};
 }//namespace detail
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType length2(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'length2' accepts only floating-point inputs");
 		return x * x;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T length2(vecType<D, T, P> const & v)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER T length2(vecType<L, T, P> const & v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'length2' accepts only floating-point inputs");
-		return detail::compute_length2<vecType, D, T, P, detail::is_aligned<P>::value>::call(v);
+		return detail::compute_length2<vecType, L, T, P, detail::is_aligned<P>::value>::call(v);
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T distance2(T p0, T p1)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'distance2' accepts only floating-point inputs");
 		return length2(p1 - p0);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T distance2(vecType<D, T, P> const & p0, vecType<D, T, P> const & p1)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER T distance2(vecType<L, T, P> const & p0, vecType<L, T, P> const & p1)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'distance2' accepts only floating-point inputs");
 		return length2(p1 - p0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T l1Norm
 	(
 		vec<3, T, P> const & a,
@@ -54,7 +54,7 @@ namespace detail
 		return abs(b.x - a.x) + abs(b.y - a.y) + abs(b.z - a.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T l1Norm
 	(
 		vec<3, T, P> const & v
@@ -63,7 +63,7 @@ namespace detail
 		return abs(v.x) + abs(v.y) + abs(v.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T l2Norm
 	(
 		vec<3, T, P> const & a,
@@ -73,7 +73,7 @@ namespace detail
 		return length(b - a);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T l2Norm
 	(
 		vec<3, T, P> const & v
@@ -82,7 +82,7 @@ namespace detail
 		return length(v);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T lxNorm
 	(
 		vec<3, T, P> const & x,
@@ -93,7 +93,7 @@ namespace detail
 		return pow(pow(y.x - x.x, T(Depth)) + pow(y.y - x.y, T(Depth)) + pow(y.z - x.z, T(Depth)), T(1) / T(Depth));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T lxNorm
 	(
 		vec<3, T, P> const & v,
diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp
index 4b31946f..cd99000a 100644
--- a/glm/gtx/normal.hpp
+++ b/glm/gtx/normal.hpp
@@ -31,7 +31,7 @@ namespace glm
 
 	//! Computes triangle normal from triangle points. 
 	//! From GLM_GTX_normal extension.
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_DECL vec<3, T, P> triangleNormal(
 		vec<3, T, P> const & p1, 
 		vec<3, T, P> const & p2, 
diff --git a/glm/gtx/normal.inl b/glm/gtx/normal.inl
index d528fc0a..cdb31dca 100644
--- a/glm/gtx/normal.inl
+++ b/glm/gtx/normal.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> triangleNormal
 	(
 		vec<3, T, P> const & p1, 
diff --git a/glm/gtx/normalize_dot.hpp b/glm/gtx/normalize_dot.hpp
index 0b144ad1..a4977d90 100644
--- a/glm/gtx/normalize_dot.hpp
+++ b/glm/gtx/normalize_dot.hpp
@@ -33,15 +33,15 @@ namespace glm
 	/// It's faster that dot(normalize(x), normalize(y)).
 	///
 	/// @see gtx_normalize_dot extension.
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL T normalizeDot(vecType<D, T, P> const & x, vecType<D, T, P> const & y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL T normalizeDot(vecType<L, T, P> const & x, vecType<L, T, P> const & y);
 
 	/// Normalize parameters and returns the dot product of x and y.
 	/// Faster that dot(fastNormalize(x), fastNormalize(y)).
 	///
 	/// @see gtx_normalize_dot extension.
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL T fastNormalizeDot(vecType<D, T, P> const & x, vecType<D, T, P> const & y);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL T fastNormalizeDot(vecType<L, T, P> const & x, vecType<L, T, P> const & y);
 
 	/// @}
 }//namespace glm
diff --git a/glm/gtx/normalize_dot.inl b/glm/gtx/normalize_dot.inl
index 7f217774..0a90aaf2 100644
--- a/glm/gtx/normalize_dot.inl
+++ b/glm/gtx/normalize_dot.inl
@@ -3,14 +3,14 @@
 
 namespace glm
 {
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T normalizeDot(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER T normalizeDot(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 	{
 		return glm::dot(x, y) * glm::inversesqrt(glm::dot(x, x) * glm::dot(y, y));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T fastNormalizeDot(vecType<D, T, P> const & x, vecType<D, T, P> const & y)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER T fastNormalizeDot(vecType<L, T, P> const & x, vecType<L, T, P> const & y)
 	{
 		return glm::dot(x, y) * glm::fastInverseSqrt(glm::dot(x, x) * glm::dot(y, y));
 	}
diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp
index da1a20c3..849e8195 100644
--- a/glm/gtx/optimum_pow.hpp
+++ b/glm/gtx/optimum_pow.hpp
@@ -32,19 +32,19 @@ namespace gtx
 	/// Returns x raised to the power of 2.
 	///
 	/// @see gtx_optimum_pow
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType pow2(genType const & x);
 
 	/// Returns x raised to the power of 3.
 	///
 	/// @see gtx_optimum_pow
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType pow3(genType const & x);
 
 	/// Returns x raised to the power of 4.
 	///
 	/// @see gtx_optimum_pow
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType pow4(genType const & x);
 
 	/// @}
diff --git a/glm/gtx/optimum_pow.inl b/glm/gtx/optimum_pow.inl
index 2216a743..2e933a23 100644
--- a/glm/gtx/optimum_pow.inl
+++ b/glm/gtx/optimum_pow.inl
@@ -3,19 +3,19 @@
 
 namespace glm
 {
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType pow2(genType const & x)
 	{
 		return x * x;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType pow3(genType const & x)
 	{
 		return x * x * x;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType pow4(genType const & x)
 	{
 		return (x * x) * (x * x);
diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp
index 2a0f5d50..562de142 100644
--- a/glm/gtx/orthonormalize.hpp
+++ b/glm/gtx/orthonormalize.hpp
@@ -34,13 +34,13 @@ namespace glm
 	/// Returns the orthonormalized matrix of m.
 	///
 	/// @see gtx_orthonormalize
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_DECL mat<3, 3, T, P> orthonormalize(mat<3, 3, T, P> const & m);
 		
 	/// Orthonormalizes x according y.
 	///
 	/// @see gtx_orthonormalize
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_DECL vec<3, T, P> orthonormalize(vec<3, T, P> const & x, vec<3, T, P> const & y);
 
 	/// @}
diff --git a/glm/gtx/orthonormalize.inl b/glm/gtx/orthonormalize.inl
index 6062c09d..ebdee8c6 100644
--- a/glm/gtx/orthonormalize.inl
+++ b/glm/gtx/orthonormalize.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> orthonormalize(mat<3, 3, T, P> const & m)
 	{
 		mat<3, 3, T, P> r = m;
@@ -22,7 +22,7 @@ namespace glm
 		return r;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER vec<3, T, P> orthonormalize(vec<3, T, P> const & x, vec<3, T, P> const & y)
 	{
 		return normalize(x - y * dot(y, x));
diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp
index 040899ff..7fe3f5bb 100644
--- a/glm/gtx/perpendicular.hpp
+++ b/glm/gtx/perpendicular.hpp
@@ -32,7 +32,7 @@ namespace glm
 
 	//! Projects x a perpendicular axis of Normal.
 	//! From GLM_GTX_perpendicular extension.
-	template <typename vecType> 
+	template<typename vecType> 
 	GLM_FUNC_DECL vecType perp(
 		vecType const & x, 
 		vecType const & Normal);
diff --git a/glm/gtx/perpendicular.inl b/glm/gtx/perpendicular.inl
index 08a7a815..e490bdd9 100644
--- a/glm/gtx/perpendicular.inl
+++ b/glm/gtx/perpendicular.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename vecType> 
+	template<typename vecType> 
 	GLM_FUNC_QUALIFIER vecType perp
 	(
 		vecType const & x, 
diff --git a/glm/gtx/polar_coordinates.hpp b/glm/gtx/polar_coordinates.hpp
index 9eeb929f..a25fddc2 100644
--- a/glm/gtx/polar_coordinates.hpp
+++ b/glm/gtx/polar_coordinates.hpp
@@ -31,14 +31,14 @@ namespace glm
 	/// Convert Euclidean to Polar coordinates, x is the xz distance, y, the latitude and z the longitude.
 	///
 	/// @see gtx_polar_coordinates
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> polar(
 		vec<3, T, P> const & euclidean);
 
 	/// Convert Polar to Euclidean coordinates.
 	///
 	/// @see gtx_polar_coordinates
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> euclidean(
 		vec<2, T, P> const & polar);
 
diff --git a/glm/gtx/polar_coordinates.inl b/glm/gtx/polar_coordinates.inl
index a4c97f9d..c4e394f5 100644
--- a/glm/gtx/polar_coordinates.inl
+++ b/glm/gtx/polar_coordinates.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> polar
 	(
 		vec<3, T, P> const & euclidean
@@ -19,7 +19,7 @@ namespace glm
 			xz_dist);				// xz distance
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> euclidean
 	(
 		vec<2, T, P> const & polar
diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp
index ad55f1c0..cab35bf9 100644
--- a/glm/gtx/projection.hpp
+++ b/glm/gtx/projection.hpp
@@ -31,7 +31,7 @@ namespace glm
 	/// Projects x on Normal.
 	///
 	/// @see gtx_projection
-	template <typename vecType>
+	template<typename vecType>
 	GLM_FUNC_DECL vecType proj(vecType const & x, vecType const & Normal);
 
 	/// @}
diff --git a/glm/gtx/projection.inl b/glm/gtx/projection.inl
index d21fe83d..8368669b 100644
--- a/glm/gtx/projection.inl
+++ b/glm/gtx/projection.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename vecType>
+	template<typename vecType>
 	GLM_FUNC_QUALIFIER vecType proj(vecType const & x, vecType const & Normal)
 	{
 		return glm::dot(x, Normal) / glm::dot(Normal, Normal) * Normal;
diff --git a/glm/gtx/quaternion.inl b/glm/gtx/quaternion.inl
index ace63768..7bdcdf60 100644
--- a/glm/gtx/quaternion.inl
+++ b/glm/gtx/quaternion.inl
@@ -6,19 +6,19 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> cross(vec<3, T, P> const& v, tquat<T, P> const& q)
 	{
 		return inverse(q) * v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> cross(tquat<T, P> const& q, vec<3, T, P> const& v)
 	{
 		return q * v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> squad
 	(
 		tquat<T, P> const & q1,
@@ -30,7 +30,7 @@ namespace glm
 		return mix(mix(q1, q2, h), mix(s1, s2, h), static_cast<T>(2) * (static_cast<T>(1) - h) * h);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> intermediate
 	(
 		tquat<T, P> const & prev,
@@ -42,7 +42,7 @@ namespace glm
 		return exp((log(next + invQuat) + log(prev + invQuat)) / static_cast<T>(-4)) * curr;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> exp(tquat<T, P> const& q)
 	{
 		vec<3, T, P> u(q.x, q.y, q.z);
@@ -54,7 +54,7 @@ namespace glm
 		return tquat<T, P>(cos(Angle), sin(Angle) * v);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> log(tquat<T, P> const& q)
 	{
 		vec<3, T, P> u(q.x, q.y, q.z);
@@ -77,7 +77,7 @@ namespace glm
 		}
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> pow(tquat<T, P> const & x, T const & y)
 	{
 		//Raising to the power of 0 should yield 1
@@ -101,19 +101,19 @@ namespace glm
 		return tquat<T, P>(cos(NewAngle) * magnitude * Mag, x.x * Div * Mag, x.y * Div * Mag, x.z * Div * Mag);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> rotate(tquat<T, P> const& q, vec<3, T, P> const& v)
 	{
 		return q * v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> rotate(tquat<T, P> const& q, vec<4, T, P> const& v)
 	{
 		return q * v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T extractRealComponent(tquat<T, P> const& q)
 	{
 		T w = static_cast<T>(1) - q.x * q.x - q.y * q.y - q.z * q.z;
@@ -123,13 +123,13 @@ namespace glm
 			return -sqrt(w);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T length2(tquat<T, P> const& q)
 	{
 		return q.x * q.x + q.y * q.y + q.z * q.z + q.w * q.w;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> shortMix(tquat<T, P> const& x, tquat<T, P> const& y, T const& a)
 	{
 		if(a <= static_cast<T>(0)) return x;
@@ -166,13 +166,13 @@ namespace glm
 			k0 * x.z + k1 * y2.z);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> fastMix(tquat<T, P> const& x, tquat<T, P> const& y, T const & a)
 	{
 		return glm::normalize(x * (static_cast<T>(1) - a) + (y * a));
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> rotation(vec<3, T, P> const& orig, vec<3, T, P> const& dest)
 	{
 		T cosTheta = dot(orig, dest);
diff --git a/glm/gtx/range.hpp b/glm/gtx/range.hpp
index b020fe4f..0877b2e4 100644
--- a/glm/gtx/range.hpp
+++ b/glm/gtx/range.hpp
@@ -31,55 +31,55 @@ namespace glm
 	/// @addtogroup gtx_range
 	/// @{
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	inline length_t components(vec<1, T, P> const & v)
 	{
 		return v.length();
 	}
 	
-	template <typename T, precision P>
+	template<typename T, precision P>
 	inline length_t components(vec<2, T, P> const & v)
 	{
 		return v.length();
 	}
 	
-	template <typename T, precision P>
+	template<typename T, precision P>
 	inline length_t components(vec<3, T, P> const & v)
 	{
 		return v.length();
 	}
 	
-	template <typename T, precision P>
+	template<typename T, precision P>
 	inline length_t components(vec<4, T, P> const & v)
 	{
 		return v.length();
 	}
 	
-	template <typename genType>
+	template<typename genType>
 	inline length_t components(genType const & m)
 	{
 		return m.length() * m[0].length();
 	}
 	
-	template <typename genType>
+	template<typename genType>
 	inline typename genType::value_type const * begin(genType const & v)
 	{
 		return value_ptr(v);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	inline typename genType::value_type const * end(genType const & v)
 	{
 		return begin(v) + components(v);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	inline typename genType::value_type * begin(genType& v)
 	{
 		return value_ptr(v);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	inline typename genType::value_type * end(genType& v)
 	{
 		return begin(v) + components(v);
diff --git a/glm/gtx/rotate_normalized_axis.hpp b/glm/gtx/rotate_normalized_axis.hpp
index 25bd07ff..229606f5 100644
--- a/glm/gtx/rotate_normalized_axis.hpp
+++ b/glm/gtx/rotate_normalized_axis.hpp
@@ -43,7 +43,7 @@ namespace glm
 	/// @see - rotate(T angle, T x, T y, T z) 
 	/// @see - rotate(mat<4, 4, T, P> const & m, T angle, T x, T y, T z) 
 	/// @see - rotate(T angle, vec<3, T, P> const & v) 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> rotateNormalizedAxis(
 		mat<4, 4, T, P> const& m,
 		T const & angle,
@@ -56,7 +56,7 @@ namespace glm
 	/// @param axis Normalized axis of the rotation, must be normalized.
 	/// 
 	/// @see gtx_rotate_normalized_axis
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL tquat<T, P> rotateNormalizedAxis(
 		tquat<T, P> const & q,
 		T const & angle,
diff --git a/glm/gtx/rotate_normalized_axis.inl b/glm/gtx/rotate_normalized_axis.inl
index fd9890e7..6cfb21b2 100644
--- a/glm/gtx/rotate_normalized_axis.inl
+++ b/glm/gtx/rotate_normalized_axis.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> rotateNormalizedAxis
 	(
 		mat<4, 4, T, P> const& m,
@@ -40,7 +40,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER tquat<T, P> rotateNormalizedAxis
 	(
 		tquat<T, P> const & q, 
diff --git a/glm/gtx/rotate_vector.hpp b/glm/gtx/rotate_vector.hpp
index 212c0ef1..a1f1ffe9 100644
--- a/glm/gtx/rotate_vector.hpp
+++ b/glm/gtx/rotate_vector.hpp
@@ -37,7 +37,7 @@ namespace glm
 	/// @param a Interpolation factor. The interpolation is defined beyond the range [0, 1].
 	/// 
 	/// @see gtx_rotate_vector
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> slerp(
 		vec<3, T, P> const & x,
 		vec<3, T, P> const & y,
@@ -45,14 +45,14 @@ namespace glm
 
 	//! Rotate a two dimensional vector.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<2, T, P> rotate(
 		vec<2, T, P> const & v,
 		T const & angle);
 		
 	//! Rotate a three dimensional vector around an axis.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> rotate(
 		vec<3, T, P> const & v,
 		T const & angle,
@@ -60,7 +60,7 @@ namespace glm
 		
 	//! Rotate a four dimensional vector around an axis.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> rotate(
 		vec<4, T, P> const & v,
 		T const & angle,
@@ -68,49 +68,49 @@ namespace glm
 		
 	//! Rotate a three dimensional vector around the X axis.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> rotateX(
 		vec<3, T, P> const & v,
 		T const & angle);
 
 	//! Rotate a three dimensional vector around the Y axis.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> rotateY(
 		vec<3, T, P> const & v,
 		T const & angle);
 		
 	//! Rotate a three dimensional vector around the Z axis.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<3, T, P> rotateZ(
 		vec<3, T, P> const & v,
 		T const & angle);
 		
 	//! Rotate a four dimentionnals vector around the X axis.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> rotateX(
 		vec<4, T, P> const & v,
 		T const & angle);
 		
 	//! Rotate a four dimensional vector around the X axis.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> rotateY(
 		vec<4, T, P> const & v,
 		T const & angle);
 		
 	//! Rotate a four dimensional vector around the X axis.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL vec<4, T, P> rotateZ(
 		vec<4, T, P> const & v,
 		T const & angle);
 		
 	//! Build a rotation matrix from a normal and a up vector.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> orientation(
 		vec<3, T, P> const & Normal,
 		vec<3, T, P> const & Up);
diff --git a/glm/gtx/rotate_vector.inl b/glm/gtx/rotate_vector.inl
index 374ebd14..7361c37d 100644
--- a/glm/gtx/rotate_vector.inl
+++ b/glm/gtx/rotate_vector.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> slerp
 	(
 		vec<3, T, P> const & x,
@@ -25,7 +25,7 @@ namespace glm
 		return x * t1 + y * t2;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, T, P> rotate
 	(
 		vec<2, T, P> const & v,
@@ -41,7 +41,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> rotate
 	(
 		vec<3, T, P> const & v,
@@ -52,7 +52,7 @@ namespace glm
 		return mat<3, 3, T, P>(glm::rotate(angle, normal)) * v;
 	}
 	/*
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> rotateGTX(
 		const vec<3, T, P>& x,
 		T angle,
@@ -63,7 +63,7 @@ namespace glm
 		return x * Cos + ((x * normal) * (T(1) - Cos)) * normal + cross(x, normal) * Sin;
 	}
 	*/
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> rotate
 	(
 		vec<4, T, P> const & v,
@@ -74,7 +74,7 @@ namespace glm
 		return rotate(angle, normal) * v;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> rotateX
 	(
 		vec<3, T, P> const & v,
@@ -90,7 +90,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> rotateY
 	(
 		vec<3, T, P> const & v,
@@ -106,7 +106,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, T, P> rotateZ
 	(
 		vec<3, T, P> const & v,
@@ -122,7 +122,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> rotateX
 	(
 		vec<4, T, P> const & v,
@@ -138,7 +138,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> rotateY
 	(
 		vec<4, T, P> const & v,
@@ -154,7 +154,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, T, P> rotateZ
 	(
 		vec<4, T, P> const & v,
@@ -170,7 +170,7 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> orientation
 	(
 		vec<3, T, P> const & Normal,
diff --git a/glm/gtx/scalar_multiplication.hpp b/glm/gtx/scalar_multiplication.hpp
index 3992f464..568391c1 100644
--- a/glm/gtx/scalar_multiplication.hpp
+++ b/glm/gtx/scalar_multiplication.hpp
@@ -30,26 +30,26 @@
 
 namespace glm
 {
-	template <typename T, typename Vec>
+	template<typename T, typename Vec>
 	using return_type_scalar_multiplication = typename std::enable_if<
 		!std::is_same<T, float>::value       // T may not be a float
 		&& std::is_arithmetic<T>::value, Vec // But it may be an int or double (no vec3 or mat3, ...)
 	>::type;
 
 #define GLM_IMPLEMENT_SCAL_MULT(Vec) \
-	template <typename T> \
+	template<typename T> \
 	return_type_scalar_multiplication<T, Vec> \
 	operator*(T const & s, Vec rh){ \
 		return rh *= static_cast<float>(s); \
 	} \
 	 \
-	template <typename T> \
+	template<typename T> \
 	return_type_scalar_multiplication<T, Vec> \
 	operator*(Vec lh, T const & s){ \
 		return lh *= static_cast<float>(s); \
 	} \
 	 \
-	template <typename T> \
+	template<typename T> \
 	return_type_scalar_multiplication<T, Vec> \
 	operator/(Vec lh, T const & s){ \
 		return lh *= 1.0f / s; \
diff --git a/glm/gtx/scalar_relational.inl b/glm/gtx/scalar_relational.inl
index 709da04c..ba9ec9d8 100644
--- a/glm/gtx/scalar_relational.inl
+++ b/glm/gtx/scalar_relational.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER bool lessThan
 	(
 		T const & x, 
@@ -13,7 +13,7 @@ namespace glm
 		return x < y;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER bool lessThanEqual
 	(
 		T const & x, 
@@ -23,7 +23,7 @@ namespace glm
 		return x <= y;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER bool greaterThan
 	(
 		T const & x, 
@@ -33,7 +33,7 @@ namespace glm
 		return x > y;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER bool greaterThanEqual
 	(
 		T const & x, 
@@ -43,7 +43,7 @@ namespace glm
 		return x >= y;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER bool equal
 	(
 		T const & x, 
@@ -53,7 +53,7 @@ namespace glm
 		return x == y;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER bool notEqual
 	(
 		T const & x, 
diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp
index 3c77cc3e..28fb7738 100644
--- a/glm/gtx/spline.hpp
+++ b/glm/gtx/spline.hpp
@@ -31,7 +31,7 @@ namespace glm
 
 	/// Return a point from a catmull rom curve.
 	/// @see gtx_spline extension.
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_DECL genType catmullRom(
 		genType const & v1, 
 		genType const & v2, 
@@ -41,7 +41,7 @@ namespace glm
 		
 	/// Return a point from a hermite curve.
 	/// @see gtx_spline extension.
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_DECL genType hermite(
 		genType const & v1, 
 		genType const & t1, 
@@ -51,7 +51,7 @@ namespace glm
 		
 	/// Return a point from a cubic curve. 
 	/// @see gtx_spline extension.
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_DECL genType cubic(
 		genType const & v1, 
 		genType const & v2, 
diff --git a/glm/gtx/spline.inl b/glm/gtx/spline.inl
index fcd33828..21269a8e 100644
--- a/glm/gtx/spline.inl
+++ b/glm/gtx/spline.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType catmullRom
 	(
 		genType const & v1, 
@@ -26,7 +26,7 @@ namespace glm
 
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType hermite
 	(
 		genType const & v1, 
@@ -48,7 +48,7 @@ namespace glm
 		return f1 * v1 + f2 * v2 + f3 * t1 + f4 * t2;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType cubic
 	(
 		genType const & v1, 
diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp
index effd2fb6..41f8cc7a 100644
--- a/glm/gtx/string_cast.hpp
+++ b/glm/gtx/string_cast.hpp
@@ -42,7 +42,7 @@ namespace glm
 
 	/// Create a string from a GLM vector or matrix typed variable.
 	/// @see gtx_string_cast extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL std::string to_string(genType const& x);
 
 	/// @}
diff --git a/glm/gtx/string_cast.inl b/glm/gtx/string_cast.inl
index 99ad91dd..0bf73a54 100644
--- a/glm/gtx/string_cast.inl
+++ b/glm/gtx/string_cast.inl
@@ -30,106 +30,106 @@ namespace detail
 	static const char* LabelTrue = "true";
 	static const char* LabelFalse = "false";
 
-	template <typename T, bool isFloat = false>
+	template<typename T, bool isFloat = false>
 	struct literal
 	{
 		GLM_FUNC_QUALIFIER static char const * value() {return "%d";};
 	};
 
-	template <typename T>
+	template<typename T>
 	struct literal<T, true>
 	{
 		GLM_FUNC_QUALIFIER static char const * value() {return "%f";};
 	};
 
 #	if GLM_MODEL == GLM_MODEL_32 && GLM_COMPILER && GLM_COMPILER_VC
-	template <>
+	template<>
 	struct literal<uint64_t, false>
 	{
 		GLM_FUNC_QUALIFIER static char const * value() {return "%lld";};
 	};
 
-	template <>
+	template<>
 	struct literal<int64_t, false>
 	{
 		GLM_FUNC_QUALIFIER static char const * value() {return "%lld";};
 	};
 #	endif//GLM_MODEL == GLM_MODEL_32 && GLM_COMPILER && GLM_COMPILER_VC
 
-	template <typename T>
+	template<typename T>
 	struct prefix{};
 
-	template <>
+	template<>
 	struct prefix<float>
 	{
 		GLM_FUNC_QUALIFIER static char const * value() {return "";};
 	};
 
-	template <>
+	template<>
 	struct prefix<double>
 	{
 		GLM_FUNC_QUALIFIER static char const * value() {return "d";};
 	};
 
-	template <>
+	template<>
 	struct prefix<bool>
 	{
 		GLM_FUNC_QUALIFIER static char const * value() {return "b";};
 	};
 
-	template <>
+	template<>
 	struct prefix<uint8_t>
 	{
 		GLM_FUNC_QUALIFIER static char const * value() {return "u8";};
 	};
 
-	template <>
+	template<>
 	struct prefix<int8_t>
 	{
 		GLM_FUNC_QUALIFIER static char const * value() {return "i8";};
 	};
 
-	template <>
+	template<>
 	struct prefix<uint16_t>
 	{
 		GLM_FUNC_QUALIFIER static char const * value() {return "u16";};
 	};
 
-	template <>
+	template<>
 	struct prefix<int16_t>
 	{
 		GLM_FUNC_QUALIFIER static char const * value() {return "i16";};
 	};
 
-	template <>
+	template<>
 	struct prefix<uint32_t>
 	{
 		GLM_FUNC_QUALIFIER static char const * value() {return "u";};
 	};
 
-	template <>
+	template<>
 	struct prefix<int32_t>
 	{
 		GLM_FUNC_QUALIFIER static char const * value() {return "i";};
 	};
 
-	template <>
+	template<>
 	struct prefix<uint64_t>
 	{
 		GLM_FUNC_QUALIFIER static char const * value() {return "u64";};
 	};
 
-	template <>
+	template<>
 	struct prefix<int64_t>
 	{
 		GLM_FUNC_QUALIFIER static char const * value() {return "i64";};
 	};
 
-	template <typename matType>
+	template<typename matType>
 	struct compute_to_string
 	{};
 
-	template <precision P>
+	template<precision P>
 	struct compute_to_string<vec<1, bool, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(vec<1, bool, P> const & x)
@@ -139,7 +139,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_to_string<vec<2, bool, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(vec<2, bool, P> const & x)
@@ -150,7 +150,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_to_string<vec<3, bool, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(vec<3, bool, P> const & x)
@@ -162,7 +162,7 @@ namespace detail
 		}
 	};
 
-	template <precision P>
+	template<precision P>
 	struct compute_to_string<vec<4, bool, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(vec<4, bool, P> const & x)
@@ -175,7 +175,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_to_string<vec<1, T, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(vec<1, T, P> const & x)
@@ -190,7 +190,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_to_string<vec<2, T, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(vec<2, T, P> const & x)
@@ -205,7 +205,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_to_string<vec<3, T, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(vec<3, T, P> const & x)
@@ -220,7 +220,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_to_string<vec<4, T, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(vec<4, T, P> const & x)
@@ -236,7 +236,7 @@ namespace detail
 	};
 
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_to_string<mat<2, 2, T, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(mat<2, 2, T, P> const & x)
@@ -254,7 +254,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_to_string<mat<2, 3, T, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(mat<2, 3, T, P> const & x)
@@ -272,7 +272,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_to_string<mat<2, 4, T, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(mat<2, 4, T, P> const & x)
@@ -290,7 +290,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_to_string<mat<3, 2, T, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(mat<3, 2, T, P> const & x)
@@ -310,7 +310,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_to_string<mat<3, 3, T, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(mat<3, 3, T, P> const & x)
@@ -330,7 +330,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_to_string<mat<3, 4, T, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(mat<3, 4, T, P> const & x)
@@ -350,7 +350,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_to_string<mat<4, 2, T, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(mat<4, 2, T, P> const & x)
@@ -372,7 +372,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_to_string<mat<4, 3, T, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(mat<4, 3, T, P> const & x)
@@ -394,7 +394,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_to_string<mat<4, 4, T, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(mat<4, 4, T, P> const & x)
@@ -417,7 +417,7 @@ namespace detail
 	};
 
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_to_string<tquat<T, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(tquat<T, P> const & x)
@@ -432,7 +432,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_to_string<tdualquat<T, P> >
 	{
 		GLM_FUNC_QUALIFIER static std::string call(tdualquat<T, P> const & x)
@@ -449,7 +449,7 @@ namespace detail
 
 }//namespace detail
 
-template <class matType>
+template<class matType>
 GLM_FUNC_QUALIFIER std::string to_string(matType const& x)
 {
 	return detail::compute_to_string<matType>::call(x);
diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp
index 1fdeb103..f6023c65 100644
--- a/glm/gtx/transform.hpp
+++ b/glm/gtx/transform.hpp
@@ -35,14 +35,14 @@ namespace glm
 	/// Transforms a matrix with a translation 4 * 4 matrix created from 3 scalars.
 	/// @see gtc_matrix_transform
 	/// @see gtx_transform
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> translate(
 		vec<3, T, P> const & v);
 
 	/// Builds a rotation 4 * 4 matrix created from an axis of 3 scalars and an angle expressed in radians. 
 	/// @see gtc_matrix_transform
 	/// @see gtx_transform
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> rotate(
 		T angle, 
 		vec<3, T, P> const & v);
@@ -50,7 +50,7 @@ namespace glm
 	/// Transforms a matrix with a scale 4 * 4 matrix created from a vector of 3 components.
 	/// @see gtc_matrix_transform
 	/// @see gtx_transform
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<4, 4, T, P> scale(
 		vec<3, T, P> const & v);
 
diff --git a/glm/gtx/transform.inl b/glm/gtx/transform.inl
index e53751d5..bd855049 100644
--- a/glm/gtx/transform.inl
+++ b/glm/gtx/transform.inl
@@ -3,19 +3,19 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> translate(vec<3, T, P> const & v)
 	{
 		return translate(mat<4, 4, T, P>(static_cast<T>(1)), v);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> rotate(T angle, vec<3, T, P> const & v)
 	{
 		return rotate(mat<4, 4, T, P>(static_cast<T>(1)), angle, v);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> scale(vec<3, T, P> const & v)
 	{
 		return scale(mat<4, 4, T, P>(static_cast<T>(1)), v);
diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp
index e8b23c22..957bd3a8 100644
--- a/glm/gtx/transform2.hpp
+++ b/glm/gtx/transform2.hpp
@@ -32,21 +32,21 @@ namespace glm
 
 	//! Transforms a matrix with a shearing on X axis.
 	//! From GLM_GTX_transform2 extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL mat<3, 3, T, P> shearX2D(
 		mat<3, 3, T, P> const& m, 
 		T y);
 
 	//! Transforms a matrix with a shearing on Y axis.
 	//! From GLM_GTX_transform2 extension.
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_DECL mat<3, 3, T, P> shearY2D(
 		mat<3, 3, T, P> const& m, 
 		T x);
 
 	//! Transforms a matrix with a shearing on X axis
 	//! From GLM_GTX_transform2 extension.
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_DECL mat<4, 4, T, P> shearX3D(
 		const mat<4, 4, T, P> & m,
 		T y, 
@@ -54,7 +54,7 @@ namespace glm
 
 	//! Transforms a matrix with a shearing on Y axis.
 	//! From GLM_GTX_transform2 extension.
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_DECL mat<4, 4, T, P> shearY3D(
 		const mat<4, 4, T, P> & m, 
 		T x, 
@@ -62,44 +62,44 @@ namespace glm
 
 	//! Transforms a matrix with a shearing on Z axis. 
 	//! From GLM_GTX_transform2 extension.
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_DECL mat<4, 4, T, P> shearZ3D(
 		const mat<4, 4, T, P> & m, 
 		T x, 
 		T y);
 
-	//template <typename T> GLM_FUNC_QUALIFIER mat<4, 4, T, P> shear(const mat<4, 4, T, P> & m, shearPlane, planePoint, angle)
+	//template<typename T> GLM_FUNC_QUALIFIER mat<4, 4, T, P> shear(const mat<4, 4, T, P> & m, shearPlane, planePoint, angle)
 	// Identity + tan(angle) * cross(Normal, OnPlaneVector)     0
 	// - dot(PointOnPlane, normal) * OnPlaneVector              1
 
 	// Reflect functions seem to don't work
-	//template <typename T> mat<3, 3, T, P> reflect2D(const mat<3, 3, T, P> & m, const vec<3, T, P>& normal){return reflect2DGTX(m, normal);}									//!< \brief Build a reflection matrix (from GLM_GTX_transform2 extension)
-	//template <typename T> mat<4, 4, T, P> reflect3D(const mat<4, 4, T, P> & m, const vec<3, T, P>& normal){return reflect3DGTX(m, normal);}									//!< \brief Build a reflection matrix (from GLM_GTX_transform2 extension)
+	//template<typename T> mat<3, 3, T, P> reflect2D(const mat<3, 3, T, P> & m, const vec<3, T, P>& normal){return reflect2DGTX(m, normal);}									//!< \brief Build a reflection matrix (from GLM_GTX_transform2 extension)
+	//template<typename T> mat<4, 4, T, P> reflect3D(const mat<4, 4, T, P> & m, const vec<3, T, P>& normal){return reflect3DGTX(m, normal);}									//!< \brief Build a reflection matrix (from GLM_GTX_transform2 extension)
 		
 	//! Build planar projection matrix along normal axis.
 	//! From GLM_GTX_transform2 extension.
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_DECL mat<3, 3, T, P> proj2D(
 		const mat<3, 3, T, P> & m, 
 		const vec<3, T, P>& normal);
 
 	//! Build planar projection matrix along normal axis.
 	//! From GLM_GTX_transform2 extension.
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_DECL mat<4, 4, T, P> proj3D(
 		const mat<4, 4, T, P> & m, 
 		const vec<3, T, P>& normal);
 
 	//! Build a scale bias matrix. 
 	//! From GLM_GTX_transform2 extension.
-	template <typename valType, precision P> 
+	template<typename valType, precision P> 
 	GLM_FUNC_DECL mat<4, 4, valType, P> scaleBias(
 		valType scale, 
 		valType bias);
 
 	//! Build a scale bias matrix.
 	//! From GLM_GTX_transform2 extension.
-	template <typename valType, precision P> 
+	template<typename valType, precision P> 
 	GLM_FUNC_DECL mat<4, 4, valType, P> scaleBias(
 		mat<4, 4, valType, P> const & m, 
 		valType scale, 
diff --git a/glm/gtx/transform2.inl b/glm/gtx/transform2.inl
index 77ae5c33..557e93cd 100644
--- a/glm/gtx/transform2.inl
+++ b/glm/gtx/transform2.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> shearX2D(mat<3, 3, T, P> const& m, T s)
 	{
 		mat<3, 3, T, P> r(1);
@@ -11,7 +11,7 @@ namespace glm
 		return m * r;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> shearY2D(mat<3, 3, T, P> const& m, T s)
 	{
 		mat<3, 3, T, P> r(1);
@@ -19,7 +19,7 @@ namespace glm
 		return m * r;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> shearX3D(mat<4, 4, T, P> const& m, T s, T t)
 	{
 		mat<4, 4, T, P> r(1);
@@ -28,7 +28,7 @@ namespace glm
 		return m * r;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> shearY3D(mat<4, 4, T, P> const& m, T s, T t)
 	{
 		mat<4, 4, T, P> r(1);
@@ -37,7 +37,7 @@ namespace glm
 		return m * r;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> shearZ3D(mat<4, 4, T, P> const& m, T s, T t)
 	{
 		mat<4, 4, T, P> r(1);
@@ -46,7 +46,7 @@ namespace glm
 		return m * r;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> reflect2D(mat<3, 3, T, P> const& m, vec<3, T, P> const& normal)
 	{
 		mat<3, 3, T, P> r(static_cast<T>(1));
@@ -57,7 +57,7 @@ namespace glm
 		return m * r;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> reflect3D(mat<4, 4, T, P> const& m, vec<3, T, P> const& normal)
 	{
 		mat<4, 4, T, P> r(static_cast<T>(1));
@@ -75,7 +75,7 @@ namespace glm
 		return m * r;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<3, 3, T, P> proj2D(
 		const mat<3, 3, T, P>& m, 
 		const vec<3, T, P>& normal)
@@ -88,7 +88,7 @@ namespace glm
 		return m * r;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> proj3D(
 		const mat<4, 4, T, P>& m, 
 		const vec<3, T, P>& normal)
@@ -106,7 +106,7 @@ namespace glm
 		return m * r;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> scaleBias(T scale, T bias)
 	{
 		mat<4, 4, T, P> result;
@@ -117,7 +117,7 @@ namespace glm
 		return result;
 	}
 
-	template <typename T, precision P> 
+	template<typename T, precision P> 
 	GLM_FUNC_QUALIFIER mat<4, 4, T, P> scaleBias(mat<4, 4, T, P> const& m, T scale, T bias)
 	{
 		return m * scaleBias(scale, bias);
diff --git a/glm/gtx/type_trait.hpp b/glm/gtx/type_trait.hpp
index fe3b3259..4f0ba9b9 100644
--- a/glm/gtx/type_trait.hpp
+++ b/glm/gtx/type_trait.hpp
@@ -41,7 +41,7 @@ namespace glm
 	/// @addtogroup gtx_type_trait
 	/// @{
 
-	template <typename T>
+	template<typename T>
 	struct type
 	{
 		static bool const is_vec = false;
@@ -52,20 +52,20 @@ namespace glm
 		static length_t const rows = 0;
 	};
 
-	template <int D, typename T, precision P>
-	struct type<vec<D, T, P>>
+	template<length_t L, typename T, precision P>
+	struct type<vec<L, T, P> >
 	{
 		static bool const is_vec = true;
 		static bool const is_mat = false;
 		static bool const is_quat = false;
 		enum
 		{
-			components = D
+			components = L
 		};
 	};
 
-	template <typename T, precision P>
-	struct type<mat<2, 2, T, P>>
+	template<typename T, precision P>
+	struct type<mat<2, 2, T, P> >
 	{
 		static bool const is_vec = false;
 		static bool const is_mat = true;
@@ -78,8 +78,8 @@ namespace glm
 		};
 	};
 
-	template <typename T, precision P>
-	struct type<mat<2, 3, T, P>>
+	template<typename T, precision P>
+	struct type<mat<2, 3, T, P> >
 	{
 		static bool const is_vec = false;
 		static bool const is_mat = true;
@@ -92,8 +92,8 @@ namespace glm
 		};
 	};
 
-	template <typename T, precision P>
-	struct type<mat<2, 4, T, P>>
+	template<typename T, precision P>
+	struct type<mat<2, 4, T, P> >
 	{
 		static bool const is_vec = false;
 		static bool const is_mat = true;
@@ -106,8 +106,8 @@ namespace glm
 		};
 	};
 
-	template <typename T, precision P>
-	struct type<mat<3, 2, T, P>>
+	template<typename T, precision P>
+	struct type<mat<3, 2, T, P> >
 	{
 		static bool const is_vec = false;
 		static bool const is_mat = true;
@@ -120,8 +120,8 @@ namespace glm
 		};
 	};
 
-	template <typename T, precision P>
-	struct type<mat<3, 3, T, P>>
+	template<typename T, precision P>
+	struct type<mat<3, 3, T, P> >
 	{
 		static bool const is_vec = false;
 		static bool const is_mat = true;
@@ -134,8 +134,8 @@ namespace glm
 		};
 	};
 
-	template <typename T, precision P>
-	struct type<mat<3, 4, T, P>>
+	template<typename T, precision P>
+	struct type<mat<3, 4, T, P> >
 	{
 		static bool const is_vec = false;
 		static bool const is_mat = true;
@@ -148,8 +148,8 @@ namespace glm
 		};
 	};
 
-	template <typename T, precision P>
-	struct type<mat<4, 2, T, P>>
+	template<typename T, precision P>
+	struct type<mat<4, 2, T, P> >
 	{
 		static bool const is_vec = false;
 		static bool const is_mat = true;
@@ -162,8 +162,8 @@ namespace glm
 		};
 	};
 
-	template <typename T, precision P>
-	struct type<mat<4, 3, T, P>>
+	template<typename T, precision P>
+	struct type<mat<4, 3, T, P> >
 	{
 		static bool const is_vec = false;
 		static bool const is_mat = true;
@@ -176,8 +176,8 @@ namespace glm
 		};
 	};
 
-	template <typename T, precision P>
-	struct type<mat<4, 4, T, P>>
+	template<typename T, precision P>
+	struct type<mat<4, 4, T, P> >
 	{
 		static bool const is_vec = false;
 		static bool const is_mat = true;
@@ -190,8 +190,8 @@ namespace glm
 		};
 	};
 
-	template <typename T, precision P>
-	struct type<tquat<T, P>>
+	template<typename T, precision P>
+	struct type<tquat<T, P> >
 	{
 		static bool const is_vec = false;
 		static bool const is_mat = false;
@@ -202,8 +202,8 @@ namespace glm
 		};
 	};
 
-	template <typename T, precision P>
-	struct type<tdualquat<T, P>>
+	template<typename T, precision P>
+	struct type<tdualquat<T, P> >
 	{
 		static bool const is_vec = false;
 		static bool const is_mat = false;
diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp
index c8075e84..276da7e8 100644
--- a/glm/gtx/vector_angle.hpp
+++ b/glm/gtx/vector_angle.hpp
@@ -36,7 +36,7 @@ namespace glm
 	//! Returns the absolute angle between two vectors.
 	//! Parameters need to be normalized.
 	/// @see gtx_vector_angle extension.
-	template <typename vecType>
+	template<typename vecType>
 	GLM_FUNC_DECL typename vecType::value_type angle(
 		vecType const & x, 
 		vecType const & y);
@@ -44,7 +44,7 @@ namespace glm
 	//! Returns the oriented angle between two 2d vectors.
 	//! Parameters need to be normalized.
 	/// @see gtx_vector_angle extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T orientedAngle(
 		vec<2, T, P> const & x,
 		vec<2, T, P> const & y);
@@ -52,7 +52,7 @@ namespace glm
 	//! Returns the oriented angle between two 3d vectors based from a reference axis.
 	//! Parameters need to be normalized.
 	/// @see gtx_vector_angle extension.
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_DECL T orientedAngle(
 		vec<3, T, P> const & x,
 		vec<3, T, P> const & y,
diff --git a/glm/gtx/vector_angle.inl b/glm/gtx/vector_angle.inl
index 0d609cc6..af99344a 100644
--- a/glm/gtx/vector_angle.inl
+++ b/glm/gtx/vector_angle.inl
@@ -3,7 +3,7 @@
 
 namespace glm
 {
-	template <typename genType> 
+	template<typename genType> 
 	GLM_FUNC_QUALIFIER genType angle
 	(
 		genType const & x,
@@ -14,11 +14,11 @@ namespace glm
 		return acos(clamp(dot(x, y), genType(-1), genType(1)));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_QUALIFIER T angle
 	(
-		vecType<D, T, P> const & x,
-		vecType<D, T, P> const & y
+		vecType<L, T, P> const& x,
+		vecType<L, T, P> const& y
 	)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'angle' only accept floating-point inputs");
@@ -26,7 +26,7 @@ namespace glm
 	}
 
 	//! \todo epsilon is hard coded to 0.01
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T orientedAngle
 	(
 		vec<2, T, P> const & x,
@@ -42,7 +42,7 @@ namespace glm
 			return -Angle;
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER T orientedAngle
 	(
 		vec<3, T, P> const & x,
diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp
index 4129da8f..80bbcea1 100644
--- a/glm/gtx/vector_query.hpp
+++ b/glm/gtx/vector_query.hpp
@@ -32,33 +32,33 @@ namespace glm
 
 	//! Check whether two vectors are collinears.
 	/// @see gtx_vector_query extensions.
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL bool areCollinear(vecType<D, T, P> const & v0, vecType<D, T, P> const & v1, T const & epsilon);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL bool areCollinear(vecType<L, T, P> const & v0, vecType<L, T, P> const & v1, T const & epsilon);
 		
 	//! Check whether two vectors are orthogonals.
 	/// @see gtx_vector_query extensions.
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL bool areOrthogonal(vecType<D, T, P> const & v0, vecType<D, T, P> const & v1, T const & epsilon);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL bool areOrthogonal(vecType<L, T, P> const & v0, vecType<L, T, P> const & v1, T const & epsilon);
 
 	//! Check whether a vector is normalized.
 	/// @see gtx_vector_query extensions.
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL bool isNormalized(vecType<D, T, P> const & v, T const & epsilon);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL bool isNormalized(vecType<L, T, P> const & v, T const & epsilon);
 		
 	//! Check whether a vector is null.
 	/// @see gtx_vector_query extensions.
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL bool isNull(vecType<D, T, P> const & v, T const & epsilon);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL bool isNull(vecType<L, T, P> const & v, T const & epsilon);
 
 	//! Check whether a each component of a vector is null.
 	/// @see gtx_vector_query extensions.
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<D, bool, P> isCompNull(vecType<D, T, P> const & v, T const & epsilon);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL vecType<L, bool, P> isCompNull(vecType<L, T, P> const & v, T const & epsilon);
 
 	//! Check whether two vectors are orthonormal.
 	/// @see gtx_vector_query extensions.
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_DECL bool areOrthonormal(vecType<D, T, P> const & v0, vecType<D, T, P> const & v1, T const & epsilon);
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_DECL bool areOrthonormal(vecType<L, T, P> const & v0, vecType<L, T, P> const & v1, T const & epsilon);
 
 	/// @}
 }// namespace glm
diff --git a/glm/gtx/vector_query.inl b/glm/gtx/vector_query.inl
index 8c5ff829..6fa84db2 100644
--- a/glm/gtx/vector_query.inl
+++ b/glm/gtx/vector_query.inl
@@ -6,10 +6,10 @@
 namespace glm{
 namespace detail
 {
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	struct compute_areCollinear{};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_areCollinear<2, T, P, vec>
 	{
 		GLM_FUNC_QUALIFIER static bool call(vec<2, T, P> const & v0, vec<2, T, P> const & v1, T const & epsilon)
@@ -18,7 +18,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_areCollinear<3, T, P, vec>
 	{
 		GLM_FUNC_QUALIFIER static bool call(vec<3, T, P> const & v0, vec<3, T, P> const & v1, T const & epsilon)
@@ -27,7 +27,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_areCollinear<4, T, P, vec>
 	{
 		GLM_FUNC_QUALIFIER static bool call(vec<4, T, P> const & v0, vec<4, T, P> const & v1, T const & epsilon)
@@ -36,10 +36,10 @@ namespace detail
 		}
 	};
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	struct compute_isCompNull{};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_isCompNull<2, T, P, vec>
 	{
 		GLM_FUNC_QUALIFIER static vec<2, bool, P> call(vec<2, T, P> const & v, T const & epsilon)
@@ -50,7 +50,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_isCompNull<3, T, P, vec>
 	{
 		GLM_FUNC_QUALIFIER static vec<3, bool, P> call(vec<3, T, P> const & v, T const & epsilon)
@@ -62,7 +62,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	struct compute_isCompNull<4, T, P, vec>
 	{
 		GLM_FUNC_QUALIFIER static vec<4, bool, P> call(vec<4, T, P> const & v, T const & epsilon)
@@ -77,24 +77,24 @@ namespace detail
 
 }//namespace detail
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_QUALIFIER bool areCollinear
 	(
-		vecType<D, T, P> const & v0,
-		vecType<D, T, P> const & v1,
+		vecType<L, T, P> const& v0,
+		vecType<L, T, P> const& v1,
 		T const & epsilon
 	)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'areCollinear' only accept floating-point inputs");
 
-		return detail::compute_areCollinear<D, T, P, vecType>::call(v0, v1, epsilon);
+		return detail::compute_areCollinear<L, T, P, vecType>::call(v0, v1, epsilon);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_QUALIFIER bool areOrthogonal
 	(
-		vecType<D, T, P> const & v0,
-		vecType<D, T, P> const & v1,
+		vecType<L, T, P> const& v0,
+		vecType<L, T, P> const& v1,
 		T const & epsilon
 	)
 	{
@@ -105,10 +105,10 @@ namespace detail
 			length(v0)) * max(static_cast<T>(1), length(v1)) * epsilon;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_QUALIFIER bool isNormalized
 	(
-		vecType<D, T, P> const & v,
+		vecType<L, T, P> const& v,
 		T const & epsilon
 	)
 	{
@@ -117,10 +117,10 @@ namespace detail
 		return abs(length(v) - static_cast<T>(1)) <= static_cast<T>(2) * epsilon;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_QUALIFIER bool isNull
 	(
-		vecType<D, T, P> const & v,
+		vecType<L, T, P> const& v,
 		T const & epsilon
 	)
 	{
@@ -129,19 +129,19 @@ namespace detail
 		return length(v) <= epsilon;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, bool, P> isCompNull
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, bool, P> isCompNull
 	(
-		vecType<D, T, P> const & v,
+		vecType<L, T, P> const& v,
 		T const & epsilon
 	)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isCompNull' only accept floating-point inputs");
 
-		return detail::compute_isCompNull<D, T, P, vecType>::call(v, epsilon);
+		return detail::compute_isCompNull<L, T, P, vecType>::call(v, epsilon);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<2, bool, P> isCompNull
 	(
 		vec<2, T, P> const & v,
@@ -152,7 +152,7 @@ namespace detail
 			abs(v.y) < epsilon);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<3, bool, P> isCompNull
 	(
 		vec<3, T, P> const & v,
@@ -165,7 +165,7 @@ namespace detail
 			abs(v.z) < epsilon);
 	}
 
-	template <typename T, precision P>
+	template<typename T, precision P>
 	GLM_FUNC_QUALIFIER vec<4, bool, P> isCompNull
 	(
 		vec<4, T, P> const & v,
@@ -179,11 +179,11 @@ namespace detail
 			abs(v.w) < epsilon);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
 	GLM_FUNC_QUALIFIER bool areOrthonormal
 	(
-		vecType<D, T, P> const & v0,
-		vecType<D, T, P> const & v1,
+		vecType<L, T, P> const& v0,
+		vecType<L, T, P> const& v1,
 		T const & epsilon
 	)
 	{
diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp
index 5db84899..67231c45 100644
--- a/glm/gtx/wrap.hpp
+++ b/glm/gtx/wrap.hpp
@@ -31,22 +31,22 @@ namespace glm
 
 	/// Simulate GL_CLAMP OpenGL wrap mode
 	/// @see gtx_wrap extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType clamp(genType const& Texcoord);
 
 	/// Simulate GL_REPEAT OpenGL wrap mode
 	/// @see gtx_wrap extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType repeat(genType const& Texcoord);
 
 	/// Simulate GL_MIRRORED_REPEAT OpenGL wrap mode
 	/// @see gtx_wrap extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType mirrorClamp(genType const& Texcoord);
 
 	/// Simulate GL_MIRROR_REPEAT OpenGL wrap mode
 	/// @see gtx_wrap extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType mirrorRepeat(genType const& Texcoord);
 
 	/// @}
diff --git a/glm/gtx/wrap.inl b/glm/gtx/wrap.inl
index 5d45d500..db10dabc 100644
--- a/glm/gtx/wrap.inl
+++ b/glm/gtx/wrap.inl
@@ -3,54 +3,54 @@
 
 namespace glm
 {
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> clamp(vecType<D, T, P> const& Texcoord)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> clamp(vecType<L, T, P> const& Texcoord)
 	{
-		return glm::clamp(Texcoord, vecType<D, T, P>(0), vecType<D, T, P>(1));
+		return glm::clamp(Texcoord, vecType<L, T, P>(0), vecType<L, T, P>(1));
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType clamp(genType const & Texcoord)
 	{
 		return clamp(vec<1, genType, defaultp>(Texcoord)).x;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> repeat(vecType<D, T, P> const& Texcoord)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> repeat(vecType<L, T, P> const& Texcoord)
 	{
 		return glm::fract(Texcoord);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType repeat(genType const & Texcoord)
 	{
 		return repeat(vec<1, genType, defaultp>(Texcoord)).x;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> mirrorClamp(vecType<D, T, P> const& Texcoord)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> mirrorClamp(vecType<L, T, P> const& Texcoord)
 	{
 		return glm::fract(glm::abs(Texcoord));
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType mirrorClamp(genType const & Texcoord)
 	{
 		return mirrorClamp(vec<1, genType, defaultp>(Texcoord)).x;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> mirrorRepeat(vecType<D, T, P> const& Texcoord)
+	template<length_t L, typename T, precision P, template<length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> mirrorRepeat(vecType<L, T, P> const& Texcoord)
 	{
-		vecType<D, T, P> const Abs = glm::abs(Texcoord);
-		vecType<D, T, P> const Clamp = glm::mod(glm::floor(Abs), vecType<D, T, P>(2));
-		vecType<D, T, P> const Floor = glm::floor(Abs);
-		vecType<D, T, P> const Rest = Abs - Floor;
-		vecType<D, T, P> const Mirror = Clamp + Rest;
-		return mix(Rest, vecType<D, T, P>(1) - Rest, glm::greaterThanEqual(Mirror, vecType<D, T, P>(1)));
+		vecType<L, T, P> const Abs = glm::abs(Texcoord);
+		vecType<L, T, P> const Clamp = glm::mod(glm::floor(Abs), vecType<L, T, P>(2));
+		vecType<L, T, P> const Floor = glm::floor(Abs);
+		vecType<L, T, P> const Rest = Abs - Floor;
+		vecType<L, T, P> const Mirror = Clamp + Rest;
+		return mix(Rest, vecType<L, T, P>(1) - Rest, glm::greaterThanEqual(Mirror, vecType<L, T, P>(1)));
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType mirrorRepeat(genType const& Texcoord)
 	{
 		return mirrorRepeat(vec<1, genType, defaultp>(Texcoord)).x;
diff --git a/test/core/core_func_common.cpp b/test/core/core_func_common.cpp
index 6ff3c393..c33f0d89 100644
--- a/test/core/core_func_common.cpp
+++ b/test/core/core_func_common.cpp
@@ -344,7 +344,7 @@ namespace clamp_
 
 namespace mix_
 {
-	template <typename T, typename B>
+	template<typename T, typename B>
 	struct entry
 	{
 		T x;
@@ -514,7 +514,7 @@ namespace mix_
 
 namespace step_
 {
-	template <typename EDGE, typename VEC>
+	template<typename EDGE, typename VEC>
 	struct entry
 	{
 		EDGE edge;
@@ -817,7 +817,7 @@ namespace isinf_
 
 namespace sign
 {
-	template <typename genFIType> 
+	template<typename genFIType> 
 	GLM_FUNC_QUALIFIER genFIType sign_if(genFIType x)
 	{
 		GLM_STATIC_ASSERT(
@@ -834,7 +834,7 @@ namespace sign
 		return result;
 	}
 
-	template <typename genFIType> 
+	template<typename genFIType> 
 	GLM_FUNC_QUALIFIER genFIType sign_alu1(genFIType x)
 	{
 		GLM_STATIC_ASSERT(
@@ -844,7 +844,7 @@ namespace sign
 		return (x >> 31) | ((unsigned)-x >> 31);
 	}
 
-	template <typename genFIType> 
+	template<typename genFIType> 
 	GLM_FUNC_QUALIFIER genFIType sign_alu2(genFIType x)
 	{
 		GLM_STATIC_ASSERT(
@@ -854,7 +854,7 @@ namespace sign
 		return -((unsigned)x >> 31) | (-(unsigned)x >> 31);
 	}
 
-	template <typename genFIType> 
+	template<typename genFIType> 
 	GLM_FUNC_QUALIFIER genFIType sign_sub(genFIType x)
 	{
 		GLM_STATIC_ASSERT(
@@ -864,7 +864,7 @@ namespace sign
 		return ((unsigned)-x >> 31) - ((unsigned)x >> 31);
 	}
 
-	template <typename genFIType> 
+	template<typename genFIType> 
 	GLM_FUNC_QUALIFIER genFIType sign_cmp(genFIType x)
 	{
 		GLM_STATIC_ASSERT(
@@ -874,7 +874,7 @@ namespace sign
 		return (x > 0) - (x < 0);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	struct type
 	{
 		genType		Value;
diff --git a/test/core/core_func_integer.cpp b/test/core/core_func_integer.cpp
index 36995e7a..1a12ff07 100644
--- a/test/core/core_func_integer.cpp
+++ b/test/core/core_func_integer.cpp
@@ -15,7 +15,7 @@ enum result
 
 namespace bitfieldInsert
 {
-	template <typename genType, typename sizeType>
+	template<typename genType, typename sizeType>
 	struct type
 	{
 		genType		Base;
@@ -59,7 +59,7 @@ namespace bitfieldInsert
 
 namespace bitfieldExtract
 {
-	template <typename genType, typename sizeType>
+	template<typename genType, typename sizeType>
 	struct type
 	{
 		genType		Value;
@@ -151,23 +151,23 @@ namespace bitfieldReverse
 		return Result;
 	}
 */
-	template <int D, typename T, glm::precision P, template <int, typename, glm::precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> bitfieldReverseLoop(vecType<D, T, P> const & v)
+	template<glm::length_t L, typename T, glm::precision P, template<glm::length_t, typename, glm::precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> bitfieldReverseLoop(vecType<L, T, P> const & v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitfieldReverse' only accept integer values");
 
-		vecType<D, T, P> Result(0);
+		vecType<L, T, P> Result(0);
 		T const BitSize = static_cast<T>(sizeof(T) * 8);
 		for(T i = 0; i < BitSize; ++i)
 		{
-			vecType<D, T, P> const BitSet(v & (static_cast<T>(1) << i));
-			vecType<D, T, P> const BitFirst(BitSet >> i);
+			vecType<L, T, P> const BitSet(v & (static_cast<T>(1) << i));
+			vecType<L, T, P> const BitFirst(BitSet >> i);
 			Result |= BitFirst << (BitSize - 1 - i);
 		}
 		return Result;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T bitfieldReverseLoop(T v)
 	{
 		return bitfieldReverseLoop(glm::vec<1, T>(v)).x;
@@ -194,30 +194,30 @@ namespace bitfieldReverse
 		return x;
 	}
 
-	template <bool EXEC = false>
+	template<bool EXEC = false>
 	struct compute_bitfieldReverseStep
 	{
-		template <int D, typename T, glm::precision P, template <int, typename, glm::precision> class vecType>
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & v, T, T)
+		template<glm::length_t L, typename T, glm::precision P, template<glm::length_t, typename, glm::precision> class vecType>
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & v, T, T)
 		{
 			return v;
 		}
 	};
 
-	template <>
+	template<>
 	struct compute_bitfieldReverseStep<true>
 	{
-		template <int D, typename T, glm::precision P, template <int, typename, glm::precision> class vecType>
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & v, T Mask, T Shift)
+		template<glm::length_t L, typename T, glm::precision P, template<glm::length_t, typename, glm::precision> class vecType>
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & v, T Mask, T Shift)
 		{
 			return (v & Mask) << Shift | (v & (~Mask)) >> Shift;
 		}
 	};
 
-	template <int D, typename T, glm::precision P, template <int, typename, glm::precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> bitfieldReverseOps(vecType<D, T, P> const & v)
+	template<glm::length_t L, typename T, glm::precision P, template<glm::length_t, typename, glm::precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> bitfieldReverseOps(vecType<L, T, P> const & v)
 	{
-		vecType<D, T, P> x(v);
+		vecType<L, T, P> x(v);
 		x = compute_bitfieldReverseStep<sizeof(T) * 8 >=  2>::call(x, T(0x5555555555555555ull), static_cast<T>( 1));
 		x = compute_bitfieldReverseStep<sizeof(T) * 8 >=  4>::call(x, T(0x3333333333333333ull), static_cast<T>( 2));
 		x = compute_bitfieldReverseStep<sizeof(T) * 8 >=  8>::call(x, T(0x0F0F0F0F0F0F0F0Full), static_cast<T>( 4));
@@ -227,13 +227,13 @@ namespace bitfieldReverse
 		return x;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType bitfieldReverseOps(genType x)
 	{
 		return bitfieldReverseOps(glm::vec<1, genType, glm::defaultp>(x)).x;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	struct type
 	{
 		genType		Value;
@@ -538,7 +538,7 @@ namespace bitfieldReverse
 
 namespace findMSB
 {
-	template <typename genType, typename retType>
+	template<typename genType, typename retType>
 	struct type
 	{
 		genType		Value;
@@ -546,7 +546,7 @@ namespace findMSB
 	};
 
 #	if GLM_HAS_BITSCAN_WINDOWS
-		template <typename genIUType>
+		template<typename genIUType>
 		GLM_FUNC_QUALIFIER int findMSB_intrinsic(genIUType Value)
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'findMSB' only accept integer values");
@@ -561,7 +561,7 @@ namespace findMSB
 #	endif//GLM_HAS_BITSCAN_WINDOWS
 
 #	if GLM_ARCH & GLM_ARCH_AVX && GLM_COMPILER & GLM_COMPILER_VC
-		template <typename genIUType>
+		template<typename genIUType>
 		GLM_FUNC_QUALIFIER int findMSB_avx(genIUType Value)
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'findMSB' only accept integer values");
@@ -573,7 +573,7 @@ namespace findMSB
 		}
 #	endif//GLM_ARCH & GLM_ARCH_AVX && GLM_PLATFORM & GLM_PLATFORM_WINDOWS
 
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER int findMSB_095(genIUType Value)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'findMSB' only accept integer values");
@@ -597,7 +597,7 @@ namespace findMSB
 		}
 	}
 
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER int findMSB_nlz1(genIUType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'findMSB' only accept integer values");
@@ -927,7 +927,7 @@ namespace findMSB
 
 namespace findLSB
 {
-	template <typename genType, typename retType>
+	template<typename genType, typename retType>
 	struct type
 	{
 		genType		Value;
@@ -950,7 +950,7 @@ namespace findLSB
 	};
 
 #	if GLM_HAS_BITSCAN_WINDOWS
-		template <typename genIUType>
+		template<typename genIUType>
 		GLM_FUNC_QUALIFIER int findLSB_intrinsic(genIUType Value)
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'findLSB' only accept integer values");
@@ -964,7 +964,7 @@ namespace findLSB
 		}
 #	endif
 
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER int findLSB_095(genIUType Value)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'findLSB' only accept integer values");
@@ -976,7 +976,7 @@ namespace findLSB
 		return Bit;
 	}
 
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER int findLSB_ntz2(genIUType x)
 	{
 		if(x == 0)
@@ -985,7 +985,7 @@ namespace findLSB
 		return glm::bitCount(~x & (x - static_cast<genIUType>(1)));
 	}
 
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER int findLSB_branchfree(genIUType x)
 	{
 		bool IsNull(x == 0);
@@ -1361,7 +1361,7 @@ namespace imulExtended
 
 namespace bitCount
 {
-	template <typename genType>
+	template<typename genType>
 	struct type
 	{
 		genType		Value;
@@ -1377,7 +1377,7 @@ namespace bitCount
 		{0x00000000,  0}
 	};
 
-	template <typename T>
+	template<typename T>
 	inline int bitCount_if(T v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitCount' only accept integer values");
@@ -1391,7 +1391,7 @@ namespace bitCount
 		return Count;
 	}
 
-	template <typename T>
+	template<typename T>
 	inline int bitCount_vec(T v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitCount' only accept integer values");
@@ -1404,40 +1404,40 @@ namespace bitCount
 		return Count;
 	}
 
-	template <bool EXEC = false>
+	template<bool EXEC = false>
 	struct compute_bitfieldBitCountStep
 	{
-		template <int D, typename T, glm::precision P, template <int, typename, glm::precision> class vecType>
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & v, T, T)
+		template<glm::length_t L, typename T, glm::precision P, template<glm::length_t, typename, glm::precision> class vecType>
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & v, T, T)
 		{
 			return v;
 		}
 	};
 
-	template <>
+	template<>
 	struct compute_bitfieldBitCountStep<true>
 	{
-		template <int D, typename T, glm::precision P, template <int, typename, glm::precision> class vecType>
-		GLM_FUNC_QUALIFIER static vecType<D, T, P> call(vecType<D, T, P> const & v, T Mask, T Shift)
+		template<glm::length_t L, typename T, glm::precision P, template<glm::length_t, typename, glm::precision> class vecType>
+		GLM_FUNC_QUALIFIER static vecType<L, T, P> call(vecType<L, T, P> const & v, T Mask, T Shift)
 		{
 			return (v & Mask) + ((v >> Shift) & Mask);
 		}
 	};
 
-	template <int D, typename T, glm::precision P, template <int, typename, glm::precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, int, P> bitCount_bitfield(vecType<D, T, P> const & v)
+	template<glm::length_t L, typename T, glm::precision P, template<glm::length_t, typename, glm::precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, int, P> bitCount_bitfield(vecType<L, T, P> const & v)
 	{
-		vecType<D, typename glm::detail::make_unsigned<T>::type, P> x(*reinterpret_cast<vecType<D, typename glm::detail::make_unsigned<T>::type, P> const *>(&v));
+		vecType<L, typename glm::detail::make_unsigned<T>::type, P> x(*reinterpret_cast<vecType<L, typename glm::detail::make_unsigned<T>::type, P> const *>(&v));
 		x = compute_bitfieldBitCountStep<sizeof(T) * 8 >=  2>::call(x, typename glm::detail::make_unsigned<T>::type(0x5555555555555555ull), typename glm::detail::make_unsigned<T>::type( 1));
 		x = compute_bitfieldBitCountStep<sizeof(T) * 8 >=  4>::call(x, typename glm::detail::make_unsigned<T>::type(0x3333333333333333ull), typename glm::detail::make_unsigned<T>::type( 2));
 		x = compute_bitfieldBitCountStep<sizeof(T) * 8 >=  8>::call(x, typename glm::detail::make_unsigned<T>::type(0x0F0F0F0F0F0F0F0Full), typename glm::detail::make_unsigned<T>::type( 4));
 		x = compute_bitfieldBitCountStep<sizeof(T) * 8 >= 16>::call(x, typename glm::detail::make_unsigned<T>::type(0x00FF00FF00FF00FFull), typename glm::detail::make_unsigned<T>::type( 8));
 		x = compute_bitfieldBitCountStep<sizeof(T) * 8 >= 32>::call(x, typename glm::detail::make_unsigned<T>::type(0x0000FFFF0000FFFFull), typename glm::detail::make_unsigned<T>::type(16));
 		x = compute_bitfieldBitCountStep<sizeof(T) * 8 >= 64>::call(x, typename glm::detail::make_unsigned<T>::type(0x00000000FFFFFFFFull), typename glm::detail::make_unsigned<T>::type(32));
-		return vecType<D, int, P>(x);
+		return vecType<L, int, P>(x);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER int bitCount_bitfield(genType x)
 	{
 		return bitCount_bitfield(glm::vec<1, genType, glm::defaultp>(x)).x;
diff --git a/test/core/core_func_matrix.cpp b/test/core/core_func_matrix.cpp
index 8037deb6..e0c1e8a6 100644
--- a/test/core/core_func_matrix.cpp
+++ b/test/core/core_func_matrix.cpp
@@ -208,7 +208,7 @@ int test_inverse_simd()
 	return Error;
 }
 
-template <typename VEC3, typename MAT4>
+template<typename VEC3, typename MAT4>
 int test_inverse_perf(std::size_t Count, std::size_t Instance, char const * Message)
 {
 	std::vector<MAT4> TestInputs;
diff --git a/test/core/core_setup_message.cpp b/test/core/core_setup_message.cpp
index 23f8f3b8..d8e03fd8 100644
--- a/test/core/core_setup_message.cpp
+++ b/test/core/core_setup_message.cpp
@@ -196,19 +196,19 @@ int test_operators()
 	return (S && !R) ? 0 : 1;
 }
 
-template <typename T>
+template<typename T>
 struct vec
 {
 
 };
 
-template <template <typename> class C, typename T>
+template<template<typename> class C, typename T>
 struct Class
 {
 
 };
 
-template <typename T>
+template<typename T>
 struct Class<vec, T>
 {
 
diff --git a/test/core/core_type_mat2x2.cpp b/test/core/core_type_mat2x2.cpp
index 72f5469a..60ae1b1c 100644
--- a/test/core/core_type_mat2x2.cpp
+++ b/test/core/core_type_mat2x2.cpp
@@ -99,7 +99,7 @@ int test_ctr()
 
 namespace cast
 {
-	template <typename genType>
+	template<typename genType>
 	int entry()
 	{
 		int Error = 0;
diff --git a/test/core/core_type_mat2x3.cpp b/test/core/core_type_mat2x3.cpp
index bb6612cf..a20d0e52 100644
--- a/test/core/core_type_mat2x3.cpp
+++ b/test/core/core_type_mat2x3.cpp
@@ -73,7 +73,7 @@ int test_ctr()
 
 namespace cast
 {
-	template <typename genType>
+	template<typename genType>
 	int entry()
 	{
 		int Error = 0;
diff --git a/test/core/core_type_mat2x4.cpp b/test/core/core_type_mat2x4.cpp
index 5793b2cc..17afebf9 100644
--- a/test/core/core_type_mat2x4.cpp
+++ b/test/core/core_type_mat2x4.cpp
@@ -73,7 +73,7 @@ int test_ctr()
 
 namespace cast
 {
-	template <typename genType>
+	template<typename genType>
 	int entry()
 	{
 		int Error = 0;
diff --git a/test/core/core_type_mat3x2.cpp b/test/core/core_type_mat3x2.cpp
index 449f5773..d3b9e95b 100644
--- a/test/core/core_type_mat3x2.cpp
+++ b/test/core/core_type_mat3x2.cpp
@@ -77,7 +77,7 @@ int test_ctr()
 
 namespace cast
 {
-	template <typename genType>
+	template<typename genType>
 	int entry()
 	{
 		int Error = 0;
diff --git a/test/core/core_type_mat3x3.cpp b/test/core/core_type_mat3x3.cpp
index fa54cefe..013d8b9a 100644
--- a/test/core/core_type_mat3x3.cpp
+++ b/test/core/core_type_mat3x3.cpp
@@ -136,7 +136,7 @@ int test_ctr()
 
 namespace cast
 {
-	template <typename genType>
+	template<typename genType>
 	int entry()
 	{
 		int Error = 0;
diff --git a/test/core/core_type_mat3x4.cpp b/test/core/core_type_mat3x4.cpp
index 112e10a5..e3b78d31 100644
--- a/test/core/core_type_mat3x4.cpp
+++ b/test/core/core_type_mat3x4.cpp
@@ -77,7 +77,7 @@ int test_ctr()
 
 namespace cast
 {
-	template <typename genType>
+	template<typename genType>
 	int entry()
 	{
 		int Error = 0;
diff --git a/test/core/core_type_mat4x2.cpp b/test/core/core_type_mat4x2.cpp
index 247b041f..1a956073 100644
--- a/test/core/core_type_mat4x2.cpp
+++ b/test/core/core_type_mat4x2.cpp
@@ -81,7 +81,7 @@ int test_ctr()
 
 namespace cast
 {
-	template <typename genType>
+	template<typename genType>
 	int entry()
 	{
 		int Error = 0;
diff --git a/test/core/core_type_mat4x3.cpp b/test/core/core_type_mat4x3.cpp
index 6700aae3..e2e50db0 100644
--- a/test/core/core_type_mat4x3.cpp
+++ b/test/core/core_type_mat4x3.cpp
@@ -81,7 +81,7 @@ int test_ctr()
 
 namespace cast
 {
-	template <typename genType>
+	template<typename genType>
 	int entry()
 	{
 		int Error = 0;
diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp
index 0adaef71..036d0dff 100644
--- a/test/core/core_type_mat4x4.cpp
+++ b/test/core/core_type_mat4x4.cpp
@@ -13,7 +13,7 @@
 #include <vector>
 
 
-template <typename genType>
+template<typename genType>
 void print(genType const & Mat0)
 {
 	printf("mat4(\n");
@@ -253,7 +253,7 @@ int perf_mul()
 
 namespace cast
 {
-	template <typename genType>
+	template<typename genType>
 	int entry()
 	{
 		int Error = 0;
diff --git a/test/core/core_type_vec4.cpp b/test/core/core_type_vec4.cpp
index 9ada8878..83ba5ef7 100644
--- a/test/core/core_type_vec4.cpp
+++ b/test/core/core_type_vec4.cpp
@@ -8,7 +8,7 @@
 #include <ctime>
 #include <vector>
 
-template <int Value>
+template<int Value>
 struct mask
 {
 	enum{value = Value};
diff --git a/test/gtc/gtc_bitfield.cpp b/test/gtc/gtc_bitfield.cpp
index a22ff860..a9346b7a 100644
--- a/test/gtc/gtc_bitfield.cpp
+++ b/test/gtc/gtc_bitfield.cpp
@@ -8,7 +8,7 @@
 
 namespace mask
 {
-	template <typename genType>
+	template<typename genType>
 	struct type
 	{
 		genType		Value;
@@ -195,7 +195,7 @@ namespace mask
 
 namespace bitfieldInterleave3
 {
-	template <typename PARAM, typename RET>
+	template<typename PARAM, typename RET>
 	inline RET refBitfieldInterleave(PARAM x, PARAM y, PARAM z)
 	{
 		RET Result = 0; 
@@ -231,7 +231,7 @@ namespace bitfieldInterleave3
 
 namespace bitfieldInterleave4
 {
-	template <typename PARAM, typename RET>
+	template<typename PARAM, typename RET>
 	inline RET loopBitfieldInterleave(PARAM x, PARAM y, PARAM z, PARAM w)
 	{
 		RET const v[4] = {x, y, z, w};
diff --git a/test/gtc/gtc_epsilon.cpp b/test/gtc/gtc_epsilon.cpp
index 20c59a1a..fcb50ac7 100644
--- a/test/gtc/gtc_epsilon.cpp
+++ b/test/gtc/gtc_epsilon.cpp
@@ -25,7 +25,7 @@ int test_defined()
 	return 0;
 }
 
-template <typename T>
+template<typename T>
 int test_equal()
 {
 	int Error(0);
diff --git a/test/gtc/gtc_round.cpp b/test/gtc/gtc_round.cpp
index 4575066c..b8f44caa 100644
--- a/test/gtc/gtc_round.cpp
+++ b/test/gtc/gtc_round.cpp
@@ -8,7 +8,7 @@
 
 namespace isPowerOfTwo
 {
-	template <typename genType>
+	template<typename genType>
 	struct type
 	{
 		genType		Value;
@@ -146,7 +146,7 @@ namespace isPowerOfTwo
 
 namespace ceilPowerOfTwo_advanced
 {
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER genIUType highestBitValue(genIUType Value)
 	{
 		genIUType tmp = Value;
@@ -159,13 +159,13 @@ namespace ceilPowerOfTwo_advanced
 		return result;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType ceilPowerOfTwo_loop(genType value)
 	{
 		return glm::isPowerOfTwo(value) ? value : highestBitValue(value) << 1;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	struct type
 	{
 		genType		Value;
@@ -332,7 +332,7 @@ namespace ceilPowerOfTwo
 
 namespace floorMultiple
 {
-	template <typename genType>
+	template<typename genType>
 	struct type
 	{
 		genType		Source;
@@ -372,7 +372,7 @@ namespace floorMultiple
 
 namespace ceilMultiple
 {
-	template <typename genType>
+	template<typename genType>
 	struct type
 	{
 		genType		Source;
diff --git a/test/gtx/gtx_common.cpp b/test/gtx/gtx_common.cpp
index b24d5e04..0ac8e72e 100644
--- a/test/gtx/gtx_common.cpp
+++ b/test/gtx/gtx_common.cpp
@@ -7,7 +7,7 @@
 
 namespace fmod_
 {
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType modTrunc(genType a, genType b)
 	{
 		return a - b * glm::trunc(a / b);
diff --git a/test/gtx/gtx_fast_trigonometry.cpp b/test/gtx/gtx_fast_trigonometry.cpp
index 03f115f6..8b9a436b 100644
--- a/test/gtx/gtx_fast_trigonometry.cpp
+++ b/test/gtx/gtx_fast_trigonometry.cpp
@@ -177,13 +177,13 @@ namespace taylorCos
 	
 	glm::vec4 const AngleShift(0.0f, glm::pi<float>() * 0.5f, glm::pi<float>() * 1.0f, glm::pi<float>() * 1.5f);
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> taylorSeriesNewCos(vecType<D, T, P> const & x)
+	template<glm::length_t L, typename T, precision P, template<glm::length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> taylorSeriesNewCos(vecType<L, T, P> const & x)
 	{
-		vecType<D, T, P> const Powed2(x * x);
-		vecType<D, T, P> const Powed4(Powed2 * Powed2);
-		vecType<D, T, P> const Powed6(Powed4 * Powed2);
-		vecType<D, T, P> const Powed8(Powed4 * Powed4);
+		vecType<L, T, P> const Powed2(x * x);
+		vecType<L, T, P> const Powed4(Powed2 * Powed2);
+		vecType<L, T, P> const Powed6(Powed4 * Powed2);
+		vecType<L, T, P> const Powed8(Powed4 * Powed4);
 
 		return static_cast<T>(1)
 			- Powed2 * static_cast<T>(0.5)
@@ -192,12 +192,12 @@ namespace taylorCos
 			+ Powed8 * static_cast<T>(2.4801587301587301587301587301587e-5);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> taylorSeriesNewCos6(vecType<D, T, P> const & x)
+	template<glm::length_t L, typename T, precision P, template<glm::length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> taylorSeriesNewCos6(vecType<L, T, P> const & x)
 	{
-		vecType<D, T, P> const Powed2(x * x);
-		vecType<D, T, P> const Powed4(Powed2 * Powed2);
-		vecType<D, T, P> const Powed6(Powed4 * Powed2);
+		vecType<L, T, P> const Powed2(x * x);
+		vecType<L, T, P> const Powed4(Powed2 * Powed2);
+		vecType<L, T, P> const Powed6(Powed4 * Powed2);
 
 		return static_cast<T>(1)
 			- Powed2 * static_cast<T>(0.5)
@@ -205,8 +205,8 @@ namespace taylorCos
 			- Powed6 * static_cast<T>(0.00138888888888888888888888888889);
 	}
 
-	template <int D, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, float, P> fastAbs(vecType<D, float, P> x)
+	template<glm::length_t L, precision P, template<glm::length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, float, P> fastAbs(vecType<L, float, P> x)
 	{
 		int* Pointer = reinterpret_cast<int*>(&x[0]);
 		Pointer[0] &= 0x7fffffff;
@@ -216,17 +216,17 @@ namespace taylorCos
 		return x;
 	}
 
-	template <int D, typename T, glm::precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastCosNew(vecType<D, T, P> const & x)
+	template<glm::length_t L, typename T, glm::precision P, template<glm::length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastCosNew(vecType<L, T, P> const & x)
 	{
-		vecType<D, T, P> const Angle0_PI(fastAbs(fmod(x + glm::pi<T>(), glm::two_pi<T>()) - glm::pi<T>()));
+		vecType<L, T, P> const Angle0_PI(fastAbs(fmod(x + glm::pi<T>(), glm::two_pi<T>()) - glm::pi<T>()));
 		return taylorSeriesNewCos6(x);
 /*
-		vecType<D, bool, P> const FirstQuarterPi(lessThanEqual(Angle0_PI, vecType<D, T, P>(glm::half_pi<T>())));
+		vecType<L, bool, P> const FirstQuarterPi(lessThanEqual(Angle0_PI, vecType<L, T, P>(glm::half_pi<T>())));
 
-		vecType<D, T, P> const RevertAngle(mix(vecType<D, T, P>(glm::pi<T>()), vecType<D, T, P>(0), FirstQuarterPi));
-		vecType<D, T, P> const ReturnSign(mix(vecType<D, T, P>(-1), vecType<D, T, P>(1), FirstQuarterPi));
-		vecType<D, T, P> const SectionAngle(RevertAngle - Angle0_PI);
+		vecType<L, T, P> const RevertAngle(mix(vecType<L, T, P>(glm::pi<T>()), vecType<L, T, P>(0), FirstQuarterPi));
+		vecType<L, T, P> const ReturnSign(mix(vecType<L, T, P>(-1), vecType<L, T, P>(1), FirstQuarterPi));
+		vecType<L, T, P> const SectionAngle(RevertAngle - Angle0_PI);
 
 		return ReturnSign * taylorSeriesNewCos(SectionAngle);
 */
@@ -254,21 +254,21 @@ namespace taylorCos
 		return Error;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> deterministic_fmod(vecType<D, T, P> const & x, T y)
+	template<glm::length_t L, typename T, precision P, template<glm::length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> deterministic_fmod(vecType<L, T, P> const & x, T y)
 	{
 		return x - y * trunc(x / y);
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastCosDeterminisctic(vecType<D, T, P> const & x)
+	template<glm::length_t L, typename T, precision P, template<glm::length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastCosDeterminisctic(vecType<L, T, P> const & x)
 	{
-		vecType<D, T, P> const Angle0_PI(abs(deterministic_fmod(x + glm::pi<T>(), glm::two_pi<T>()) - glm::pi<T>()));
-		vecType<D, bool, P> const FirstQuarterPi(lessThanEqual(Angle0_PI, vecType<D, T, P>(glm::half_pi<T>())));
+		vecType<L, T, P> const Angle0_PI(abs(deterministic_fmod(x + glm::pi<T>(), glm::two_pi<T>()) - glm::pi<T>()));
+		vecType<L, bool, P> const FirstQuarterPi(lessThanEqual(Angle0_PI, vecType<L, T, P>(glm::half_pi<T>())));
 
-		vecType<D, T, P> const RevertAngle(mix(vecType<D, T, P>(glm::pi<T>()), vecType<D, T, P>(0), FirstQuarterPi));
-		vecType<D, T, P> const ReturnSign(mix(vecType<D, T, P>(-1), vecType<D, T, P>(1), FirstQuarterPi));
-		vecType<D, T, P> const SectionAngle(RevertAngle - Angle0_PI);
+		vecType<L, T, P> const RevertAngle(mix(vecType<L, T, P>(glm::pi<T>()), vecType<L, T, P>(0), FirstQuarterPi));
+		vecType<L, T, P> const ReturnSign(mix(vecType<L, T, P>(-1), vecType<L, T, P>(1), FirstQuarterPi));
+		vecType<L, T, P> const SectionAngle(RevertAngle - Angle0_PI);
 
 		return ReturnSign * taylorSeriesNewCos(SectionAngle);
 	}
@@ -295,8 +295,8 @@ namespace taylorCos
 		return Error;
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> taylorSeriesRefCos(vecType<D, T, P> const & x)
+	template<glm::length_t L, typename T, precision P, template<glm::length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> taylorSeriesRefCos(vecType<L, T, P> const & x)
 	{
 		return static_cast<T>(1)
 			- (x * x) / glm::factorial(static_cast<T>(2))
@@ -305,17 +305,17 @@ namespace taylorCos
 			+ (x * x * x * x * x * x * x * x) / glm::factorial(static_cast<T>(8));
 	}
 
-	template <int D, typename T, precision P, template <int, typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<D, T, P> fastRefCos(vecType<D, T, P> const & x)
+	template<glm::length_t L, typename T, precision P, template<glm::length_t, typename, precision> class vecType>
+	GLM_FUNC_QUALIFIER vecType<L, T, P> fastRefCos(vecType<L, T, P> const & x)
 	{
-		vecType<D, T, P> const Angle0_PI(glm::abs(fmod(x + glm::pi<T>(), glm::two_pi<T>()) - glm::pi<T>()));
+		vecType<L, T, P> const Angle0_PI(glm::abs(fmod(x + glm::pi<T>(), glm::two_pi<T>()) - glm::pi<T>()));
 //		return taylorSeriesRefCos(Angle0_PI);
 
-		vecType<D, bool, P> const FirstQuarterPi(lessThanEqual(Angle0_PI, vecType<D, T, P>(glm::half_pi<T>())));
+		vecType<L, bool, P> const FirstQuarterPi(lessThanEqual(Angle0_PI, vecType<L, T, P>(glm::half_pi<T>())));
 
-		vecType<D, T, P> const RevertAngle(mix(vecType<D, T, P>(glm::pi<T>()), vecType<D, T, P>(0), FirstQuarterPi));
-		vecType<D, T, P> const ReturnSign(mix(vecType<D, T, P>(-1), vecType<D, T, P>(1), FirstQuarterPi));
-		vecType<D, T, P> const SectionAngle(RevertAngle - Angle0_PI);
+		vecType<L, T, P> const RevertAngle(mix(vecType<L, T, P>(glm::pi<T>()), vecType<L, T, P>(0), FirstQuarterPi));
+		vecType<L, T, P> const ReturnSign(mix(vecType<L, T, P>(-1), vecType<L, T, P>(1), FirstQuarterPi));
+		vecType<L, T, P> const SectionAngle(RevertAngle - Angle0_PI);
 
 		return ReturnSign * taylorSeriesRefCos(SectionAngle);
 	}
diff --git a/test/gtx/gtx_io.cpp b/test/gtx/gtx_io.cpp
index 36c993aa..f28b464b 100644
--- a/test/gtx/gtx_io.cpp
+++ b/test/gtx/gtx_io.cpp
@@ -7,7 +7,7 @@
 
 namespace
 {
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, glm::precision const& a)
 	{
 		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
@@ -29,7 +29,7 @@ namespace
 		return os;
 	}
 
-	template <typename U, glm::precision P, typename T, typename CTy, typename CTr>
+	template<typename U, glm::precision P, typename T, typename CTy, typename CTr>
 	std::basic_string<CTy> type_name(std::basic_ostream<CTy,CTr>& os, T const&)
 	{
 		std::basic_ostringstream<CTy,CTr> ostr;
@@ -55,7 +55,7 @@ namespace
 	}
 } // namespace {
 
-template <typename T, glm::precision P, typename OS>
+template<typename T, glm::precision P, typename OS>
 int test_io_quat(OS& os)
 {
 	os << '\n' << typeid(OS).name() << '\n';
@@ -79,7 +79,7 @@ int test_io_quat(OS& os)
 	return 0;
 }
 
-template <typename T, glm::precision P, typename OS>
+template<typename T, glm::precision P, typename OS>
 int test_io_vec(OS& os)
 {
 	os << '\n' << typeid(OS).name() << '\n';
@@ -102,7 +102,7 @@ int test_io_vec(OS& os)
 	return 0;
 }
 
-template <typename T, glm::precision P, typename OS>
+template<typename T, glm::precision P, typename OS>
 int test_io_mat(OS& os, glm::io::order_type otype)
 {
 	os << '\n' << typeid(OS).name() << '\n';
diff --git a/test/gtx/gtx_type_aligned.cpp b/test/gtx/gtx_type_aligned.cpp
index 9332138e..bc957002 100644
--- a/test/gtx/gtx_type_aligned.cpp
+++ b/test/gtx/gtx_type_aligned.cpp
@@ -79,7 +79,7 @@ int test_decl()
 	return Error;
 }
 
-template <typename genType>
+template<typename genType>
 void print(genType const & Mat0)
 {
 	printf("mat4(\n");