diff --git a/.travis.yml b/.travis.yml
index a47ae057204..0274556bd2c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -144,6 +144,7 @@ addons:
       - qt55svg
       - qt55tools
       - qt55graphicaleffects
+      - libopencv-dev
        
       - mesa-common-dev
       - libglu1-mesa-dev
diff --git a/.travis/build_package.sh b/.travis/build_package.sh
index 4efa4f9dbb6..d2553dc3bb5 100755
--- a/.travis/build_package.sh
+++ b/.travis/build_package.sh
@@ -60,11 +60,6 @@ do
     bash Scripts/developer_scripts/cgal_check_dependencies.sh /usr/bin/doxygen
     cd .travis
     zsh $ROOT/Scripts/developer_scripts/test_merge_of_branch HEAD
-    mkdir -p build-travis
-    pushd build-travis
-    cmake -DCGAL_ENABLE_CHECK_HEADERS=ON -DQt5_DIR="/opt/qt55/lib/cmake/Qt5 -std=c++11" ../..
-    make -j2 check_headers
-    popd
   	#parse current matrix and check that no package has been forgotten
 	  old_IFS=$IFS
 	  IFS=$'\n'
@@ -120,6 +115,7 @@ do
     cd ..
     exit 0
   fi
+    
 	EXAMPLES="$ARG/examples/$ARG"
 	TEST="$ARG/test/$ARG" 
 	DEMOS=$ROOT/$ARG/demo/*
diff --git a/.travis/template.txt b/.travis/template.txt
index b483bfd89c3..d0142cfe57b 100644
--- a/.travis/template.txt
+++ b/.travis/template.txt
@@ -7,17 +7,20 @@ matrix:
 install: 
   - bash .travis/install.sh 
   - if [[ "$CXX" = "clang++" ]]; then export CXX=clang++-3.6 CC=clang-3.6; fi
-
 before_script: 
+- wget -O doxygen_exe https://cgal.geometryfactory.com/~mgimeno/doxygen_exe
+- sudo mv doxygen_exe /usr/bin/doxygen
+- sudo chmod +x /usr/bin/doxygen
 - mkdir -p build 
 - cd build 
-- cmake -DCGAL_HEADER_ONLY=ON -DQt5_DIR="/opt/qt55/lib/cmake/Qt5" -DQt5Svg_DIR="/opt/qt55/lib/cmake/Qt5Svg" -DQt5OpenGL_DIR="/opt/qt55/lib/cmake/Qt5OpenGL" -DCMAKE_CXX_FLAGS_RELEASE=-DCGAL_NDEBUG .. 
+- cmake -DCMAKE_CXX_FLAGS="-std=c++11" -DCGAL_HEADER_ONLY=ON -DQt5_DIR="/opt/qt55/lib/cmake/Qt5" -DQt5Svg_DIR="/opt/qt55/lib/cmake/Qt5Svg" -DQt5OpenGL_DIR="/opt/qt55/lib/cmake/Qt5OpenGL" -DCMAKE_CXX_FLAGS_RELEASE=-DCGAL_NDEBUG .. 
 - make 
 - sudo make install &>/dev/null
 - cd ..
 - sudo bash ./.travis/install_openmesh.sh
 script:
 - cd ./.travis
+- doxygen --version
 - bash -x -e ./build_package.sh $PACKAGE
 addons: 
   apt:
@@ -27,8 +30,11 @@ addons:
     packages:
       - clang-3.6
       - zsh
+      - flex
+      - bison
       - cmake 
       - libboost1.55-dev 
+      - graphviz
       - libboost-system1.55-dev 
       - libboost-program-options1.55-dev 
       - libboost-thread1.55-dev 
@@ -43,6 +49,7 @@ addons:
       - qt55svg
       - qt55tools
       - qt55graphicaleffects
+      - libopencv-dev
        
       - mesa-common-dev
       - libglu1-mesa-dev
diff --git a/Scripts/developer_scripts/cgal_check_dependencies.sh b/Scripts/developer_scripts/cgal_check_dependencies.sh
index a8d56952a85..cf5e48d3d86 100644
--- a/Scripts/developer_scripts/cgal_check_dependencies.sh
+++ b/Scripts/developer_scripts/cgal_check_dependencies.sh
@@ -27,7 +27,8 @@ do
 done
 
 cmake -DCGAL_ENABLE_CHECK_HEADERS=TRUE -DDOXYGEN_EXECUTABLE="$DOX_PATH" -DCGAL_COPY_DEPENDENCIES=TRUE -DCMAKE_CXX_FLAGS="-std=c++11" ..
-make -j$(nproc --all) packages_dependencies
+make -j$(nproc --all) check_headers
+echo " Checks finished"
 for pkg in ../*
 do
   if [ -f $pkg/dependencies ]; then
@@ -36,9 +37,12 @@ do
       HAS_DIFF=TRUE
       echo "Differences in $pkg: $PKG_DIFF"
       fi
-    rm $pkg/dependencies.old
+    if [ -f $pkg/dependencies.old ]; then
+      rm $pkg/dependencies.old
+    fi
   fi
 done
+echo " Checks finished"
 cd $CGAL_ROOT
 rm -r dep_check_build
 if [ -n "$HAS_DIFF" ]; then
diff --git a/Surface_mesh/examples/Surface_mesh/sm_bgl.cpp b/Surface_mesh/examples/Surface_mesh/sm_bgl.cpp
index 7b0d0b8b00d..f7fd97f6894 100644
--- a/Surface_mesh/examples/Surface_mesh/sm_bgl.cpp
+++ b/Surface_mesh/examples/Surface_mesh/sm_bgl.cpp
@@ -21,15 +21,6 @@ int main(int /* argc */, char* argv[])
   Mesh sm;
   std::ifstream in(argv[1]);
   in >> sm;
-
-  for (auto vertex_iterator : sm.vertices()) {
-          Point p(1,0,1);
-          sm.point(vertex_iterator) = p;
-        }
-  for (auto vertex_iterator : sm.vertices()) {
-          std::cout<<sm.point(vertex_iterator)<<std::endl;
-        }
-  return 0;
   Mesh::Property_map<vertex_descriptor,vertex_descriptor> predecessor;
   predecessor = sm.add_property_map<vertex_descriptor,vertex_descriptor>("v:predecessor").first;