diff --git a/doc/glm.docx b/doc/glm.docx
index 363dc21b..5c76b414 100644
Binary files a/doc/glm.docx and b/doc/glm.docx differ
diff --git a/doc/glm.pdf b/doc/glm.pdf
index 399709e8..d9dd1f3b 100644
Binary files a/doc/glm.pdf and b/doc/glm.pdf differ
diff --git a/glm/detail/func_integer.inl b/glm/detail/func_integer.inl
index 4345e8fa..a4f6847e 100644
--- a/glm/detail/func_integer.inl
+++ b/glm/detail/func_integer.inl
@@ -104,7 +104,7 @@ namespace detail
 		}
 	};
 
-#	if(GLM_ARCH != GLM_ARCH_PURE) && ((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_LLVM) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
+#	if(GLM_ARCH != GLM_ARCH_PURE) && ((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_INTEL)) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
 		template <typename genIUType>
 		struct compute_findLSB<genIUType, 32>
 		{
@@ -162,7 +162,7 @@ namespace detail
 		}
 	};
 
-#	if(GLM_ARCH != GLM_ARCH_PURE) && ((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_LLVM) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
+#	if(GLM_ARCH != GLM_ARCH_PURE) && ((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_INTEL)) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
 		template <typename genIUType>
 		GLM_FUNC_QUALIFIER int compute_findMSB_32(genIUType Value)
 		{
diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
index e5982bad..5c905e42 100644
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@@ -580,7 +580,7 @@
 #	define GLM_ARCH (GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 #elif defined(GLM_FORCE_SSE2)
 #	define GLM_ARCH (GLM_ARCH_SSE2)
-#elif GLM_COMPILER & (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM | GLM_COMPILER_GCC)
+#elif (GLM_COMPILER & (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM | GLM_COMPILER_GCC)) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_LINUX))
 #	if(__AVX2__)
 #		define GLM_ARCH (GLM_ARCH_AVX2 | GLM_ARCH_AVX | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 #	elif(__AVX__)
@@ -592,7 +592,7 @@
 #	else
 #		define GLM_ARCH GLM_ARCH_PURE
 #	endif
-#elif GLM_COMPILER & GLM_COMPILER_VC
+#elif (GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS))
 #	if defined(__AVX2__)
 #		define GLM_ARCH (GLM_ARCH_AVX2 | GLM_ARCH_AVX | GLM_ARCH_SSE4 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 #	elif defined(__AVX__)