diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac5f2b6..168957f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,13 @@
-cmake_minimum_required(VERSION 2.8.3)
-project(rf2o_laser_odometry)
-set (CMAKE_CXX_STANDARD 14)  # Require C++14
+PROJECT(rf2o_laser_odometry)
+
+CMAKE_MINIMUM_REQUIRED(VERSION 3.3)
+# Require C++17
+
+if(${CMAKE_VERSION} VERSION_LESS "3.8.0")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+else()
+	set(CMAKE_CXX_STANDARD 17)
+endif()
 
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
@@ -21,6 +28,7 @@ find_package(Boost REQUIRED COMPONENTS system)
 find_package(cmake_modules REQUIRED)
 find_package(Eigen3 REQUIRED)
 find_package(MRPT REQUIRED base obs) # maps slam
+
 #include_directories(${MRPT_INCLUDE_DIRS})
 MESSAGE( STATUS "MRPT_INCLUDE_DIRS: " ${MRPT_INCLUDE_DIRS})
 #link_directories(${MRPT_LIBRARY_DIRS})
diff --git a/include/rf2o_laser_odometry/CLaserOdometry2D.h b/include/rf2o_laser_odometry/CLaserOdometry2D.h
index 6985391..caef3b0 100644
--- a/include/rf2o_laser_odometry/CLaserOdometry2D.h
+++ b/include/rf2o_laser_odometry/CLaserOdometry2D.h
@@ -30,7 +30,6 @@
 #   include <mrpt/slam/CObservation2DRangeScan.h>
 #   include <mrpt/slam/CObservationOdometry.h>
     typedef mrpt::poses::CObservation2DRangeScan CObservation2DRangeScan;
-
 #endif
 
 #if MRPT_VERSION<0x150