diff --git a/CMakeLists.txt b/CMakeLists.txt
index 622d755547dd90b789acfbe10668ed88a6c3be85..0fd2955d87c1251586fd359be147dfa389326554 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,7 +168,8 @@ TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME}
   ${EIGEN3_INCLUDE_DIRS} 
   ${PYTHON_INCLUDE_DIRS} 
   ${NUMPY_INCLUDE_DIRS}
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+  $<INSTALL_INTERFACE:include>)
 
 IF(NOT WIN32)
   TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:-bigobj> "-Wno-conversion")
@@ -180,7 +181,7 @@ TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME} PUBLIC)
 PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} eigen3)
 INSTALL(TARGETS ${PROJECT_NAME}
   EXPORT ${TARGETS_EXPORT_NAME}
-  PUBLIC_HEADER
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}
   INCLUDES DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
@@ -189,9 +190,6 @@ INSTALL(TARGETS ${PROJECT_NAME}
 ADD_HEADER_GROUP(${PROJECT_NAME}_HEADERS)
 ADD_SOURCE_GROUP(${PROJECT_NAME}_SOURCES)
 
-TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
-SET(PUBLIC_HEADER ${${PROJECT_NAME}_HEADERS})
-
 # Install package for ROS
 install(FILES package.xml DESTINATION share/eigenpy)
 
diff --git a/cmake b/cmake
index 321eb1ccf1d94570eb564f3659b13ef3ef82239e..1e577483d7ed38a810c86f53972b9bc8b13d6e33 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 321eb1ccf1d94570eb564f3659b13ef3ef82239e
+Subproject commit 1e577483d7ed38a810c86f53972b9bc8b13d6e33
diff --git a/include/eigenpy/quaternion.hpp b/include/eigenpy/quaternion.hpp
index 9e317fc652c34b723b98e263acf6eb0872c274c7..f1e830893f427b6223b1ed281afe5e82878321c2 100644
--- a/include/eigenpy/quaternion.hpp
+++ b/include/eigenpy/quaternion.hpp
@@ -83,7 +83,7 @@ namespace eigenpy
                                 "\tquat: a quaternion."))
       .def("__init__",bp::make_constructor(&QuaternionVisitor::FromTwoVectors,
                                            bp::default_call_policies(),
-                                           (bp::arg("u: a 3D vector"),bp::arg("v: a 3D vector"))),
+                                           (bp::arg("u"),bp::arg("v"))),
            "Initialize from two vectors u and v")
       .def(bp::init<Scalar,Scalar,Scalar,Scalar>
            ((bp::arg("self"),bp::arg("w"),bp::arg("x"),bp::arg("y"),bp::arg("z")),