diff --git a/CHANGELOG b/CHANGELOG
index c74b8d6..0612960 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,12 @@
 
+Version 1.5.1
+- Improved the GEMM example to support the Intel MIC (Xeon Phi) accelerators
+- Updated compiler check and compiler flags
+- Adds support for multiple OpenCL kernel files at once (e.g. when wanting to include a header file)
+- Adds support for the std::complex data-types
+- Fixed some compilation warnings regarding size_t conversions
+- Updated the FindOpenCL.cmake file
+
 Version 1.5.0
 - OpenCL local work size and memory size constraints are now automatically handled
 - Greatly improved the new 2D convolution example:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c90f3be..2ade1e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ cmake_minimum_required(VERSION 2.8)
 project("cltune" CXX)
 set(cltune_VERSION_MAJOR 1)
 set(cltune_VERSION_MINOR 5)
-set(cltune_VERSION_PATCH 0)
+set(cltune_VERSION_PATCH 1)
 
 # Options
 option(SAMPLES "Enable compilation of sample programs" ON)
@@ -48,10 +48,14 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
         message(FATAL_ERROR "GCC version must be at least 4.9")
     endif()
-elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # Note: what about AppleClang?
+elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.3)
         message(FATAL_ERROR "Clang version must be at least 3.3")
     endif()
+elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+        message(FATAL_ERROR "Clang version must be at least 5.0")
+    endif()
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14.0)
         message(FATAL_ERROR "ICC version must be at least 14.0")
@@ -66,7 +70,7 @@ endif()
 set(FLAGS "-O3 -std=c++11")
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
   set(FLAGS "${FLAGS} -Wall -Wno-comment")
-elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # Note: what about AppleClang?
+elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
   #set(FLAGS "${FLAGS} -Weverything -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded")
 endif()
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}")