diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64b259243708dc4c69e582c268871a1ecb895a75..f0f58fe01900a6267b772186b11ef6177425e84e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,11 +7,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.9.1] - 2019-07-18
+
 ### Added
 
 - Google benchmark submodule for micro benchmarking. This will enabled future optimisation
   - Benchmark tests for QueryBuilder
 
+### Fixed
+
+- Fix to build system - can build without Clang enabled now.
+- Updates/corrections to docs
+
 ## [0.9.0] - 2019-07-12
 
 ### Added
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 346a4cdc0d0be8b8cd8bf1a0df9b44d262f4aa6a..4fe382feb53ab51daed3dc5f957af5f49606684e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ set(LIBHDBPP_TIMESCALE_NAME "libhdb++timescale")
 # Versioning
 set(VERSION_MAJOR "0")
 set(VERSION_MINOR "9")
-set(VERSION_PATCH "0")
+set(VERSION_PATCH "1")
 set(VERSION_METADATA "")
 set(VERSION_STRING ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
@@ -145,10 +145,15 @@ set_target_properties(libhdbpp_timescale_shared_library
         LINK_FLAGS "-Wl,--no-undefined"
         CXX_STANDARD 14
         POSITION_INDEPENDENT_CODE 1
-        CXX_CLANG_TIDY ${DO_CLANG_TIDY}
         VERSION ${VERSION_STRING}
         SOVERSION ${VERSION_STRING})
 
+if(DO_CLANG_TIDY)
+    set_target_properties(libhdbpp_timescale_shared_library 
+        PROPERTIES 
+            CXX_CLANG_TIDY ${DO_CLANG_TIDY})
+endif(DO_CLANG_TIDY)
+
 target_compile_options(libhdbpp_timescale_shared_library 
     PRIVATE "$<$<CONFIG:DEBUG>:-g>")
 
@@ -166,7 +171,8 @@ set_target_properties(libhdbpp_timescale_static_library
         CXX_STANDARD 14
         EXCLUDE_FROM_ALL 1)
 
-target_compile_options(libhdbpp_timescale_static_library PRIVATE "$<$<CONFIG:DEBUG>:-g>")
+target_compile_options(libhdbpp_timescale_static_library 
+    PRIVATE "$<$<CONFIG:DEBUG>:-g>")
 
 # Install Config -----------------------------------
 install(