diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a4b7c92..83beffcb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,7 @@ target_include_directories(sqlpp11 INTERFACE
   $<BUILD_INTERFACE:${sqlpp11_SOURCE_DIR}/include>
   )
 
+if (NOT MSVC)
 target_compile_features(sqlpp11 INTERFACE
 	cxx_alias_templates
 	cxx_auto_type
@@ -54,6 +55,7 @@ target_compile_features(sqlpp11 INTERFACE
 	cxx_template_template_parameters
   cxx_variadic_templates
   )
+endif ()
 
 add_subdirectory(tests)
 add_subdirectory(test_constraints)
diff --git a/README.md b/README.md
index 57411d8f..6b6505b5 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,16 @@
 sqlpp11
 =======
 
-[![Build Status](https://travis-ci.org/purpleKarrot/sqlpp11.svg?branch=develop)](https://travis-ci.org/purpleKarrot/sqlpp11)
-[![Coverage Status](https://coveralls.io/repos/purpleKarrot/sqlpp11/badge.svg?branch=develop)](https://coveralls.io/r/purpleKarrot/sqlpp11?branch=develop)
+[![Build Status](https://travis-ci.org/rbock/sqlpp11.svg?branch=develop)](https://travis-ci.org/rbock/sqlpp11?branch=develop)
+[![Coverage Status](https://coveralls.io/repos/rbock/sqlpp11/badge.svg?branch=develop)](https://coveralls.io/r/rbock/sqlpp11?branch=develop)
 
 A type safe embedded domain specific language for SQL queries and results in C++
 
 Extensive documentation is found in the wiki, https://github.com/rbock/sqlpp11/wiki
 
-Upcoming talks/workshops) at 
+Past talks/workshops at 
+  * CppCast: http://cppcast.com
+   * 2015-05-07: http://cppcast.com/2015/05/roland-bock/
   * CppCon (Bellevue, Washington, USA): http://cppcon.org
    * 2014-09-08: http://sched.co/1qhngYK (Workshop Part 1)
    * 2014-09-11: http://sched.co/1r4lue3 (Talk)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 669b2b9f..66ba4a0f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -24,7 +24,10 @@
 
 add_library(sqlpp11_testing INTERFACE)
 target_include_directories(sqlpp11_testing INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+
+if (NOT MSVC)
 target_compile_options(sqlpp11_testing INTERFACE -Wall -Wextra -pedantic)
+endif ()
 
 set(test_names
   BooleanExpression