diff --git a/.travis.yml b/.travis.yml
index 38c0324a..39ee5821 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,41 +2,27 @@ language: cpp
 
 os:
   - linux
-  - osx
 
 compiler:
-  - clang
+  # - clang # disabled clang due to missing libc++
   - gcc
 
-matrix:
-  # This excludes OSX builds from the build matrix for gcc
-  exclude:
-    - os: osx
-      compiler: gcc
-
-branches:
-  only:
-    - master
-    - develop
-
 notifications:
  email:
    on_success: change
    on_failure: always
 
 before_install:
-  - "if [ $CC = 'gcc' ]; then export CXX=g++; fi"
-  - "if [ $CC = 'clang' ]; then export CXX=clang++; fi"
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then brew install cmake; fi"
-  # Install cpp-coveralls for reporting test coverage under only linux, see https://github.com/eddyxu/cpp-coveralls
-  #- "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo pip install cpp-coveralls; fi"
+  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+  - sudo apt-get update
+  - if [ "$CXX" = "g++" ]; then sudo apt-get install g++-4.8; fi
+  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
+
 
 install:
   - "mkdir -p $TRAVIS_BUILD_DIR/build/scripts"
   - "cd $TRAVIS_BUILD_DIR/build/scripts"
-  # Enable test coverage for travis-ci build
-  #- "cmake $TRAVIS_BUILD_DIR/src -DNTA_COV_ENABLED=ON"
-  - "cmake $TRAVIS_BUILD_DIR/src"
+  - "cmake $TRAVIS_BUILD_DIR"
 
 script:
   - "cd $TRAVIS_BUILD_DIR/build/scripts"
@@ -44,10 +30,3 @@ script:
   # test compile-time constraints
   - "make test_sqlpp_constraints"
 
-after_success:
-  - "cd $TRAVIS_BUILD_DIR"
-  # Send test coverage report to http://coveralls.io under only linux
-  # - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then coveralls --exclude external --exclude doc --exclude src/test; fi"
-
-
-
diff --git a/CREDITS b/CREDITS
index 6ad7db8e..3675cef0 100644
--- a/CREDITS
+++ b/CREDITS
@@ -7,8 +7,12 @@ This library evolved through several stages and would probably not exist without
 	* Peter Knoblach: Initial ideas
 	* Ulrich Küttler: Feedback and extensions
 
+
 	* Metafeed GmbH: Production code using a forerunner version
 	* PPRO Financial Ltd: Production code using sqlpp11 and a forerunner version
+	* The boost community: Invaluable suggestions and critiques
+
+  * Meeting C++ Munich: Hosted the first talk about sqlpp11
 
 
 If you miss your name of this list, please let me know.
diff --git a/README.md b/README.md
index f25797ba..0b8d6ebe 100644
--- a/README.md
+++ b/README.md
@@ -105,6 +105,7 @@ sqlpp11 makes heavy use of C++11 and requires a recent compiler and STL. The fol
   * clang-3.2 on Ubuntu-12.4
   * clang-3.4 on Ubuntu-12.4
   * g++-4.8 on Ubuntu-12.4
+  * g++-4.8 on cygwin 64bit
   * g++-4.9 on Debian Unstable
 
 __Database Connector:__
diff --git a/test_constraints/CMakeLists.txt b/test_constraints/CMakeLists.txt
index 6b4693d5..aec592e4 100644
--- a/test_constraints/CMakeLists.txt
+++ b/test_constraints/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_BINARY_DIR}/tests)
+include_directories(${CMAKE_SOURCE_DIR}/tests)
 
 add_custom_target(test_sqlpp_constraints COMMAND true)