diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29b84195898ed38453f2eefeca9aa4328a7a8a85..4c5c6cd110a7df1349adff53bc8af4fd76f626cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,6 +122,7 @@ SET(${PROJECT_NAME}_SOURCES
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SUFFIX "${PYTHON_EXT_SUFFIX}")
+TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:-bigobj>)
 
 TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME})
 PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} eigen3)
diff --git a/include/eigenpy/quaternion.hpp b/include/eigenpy/quaternion.hpp
index 2017d4ea14a942d63fc7613330071ba13546e110..de9592c3af3306311edc40612df438a5645ebfa5 100644
--- a/include/eigenpy/quaternion.hpp
+++ b/include/eigenpy/quaternion.hpp
@@ -102,8 +102,8 @@ namespace eigenpy
       /* --- Methods --- */
       .def("coeffs",(const Vector4 & (Quaternion::*)()const)&Quaternion::coeffs,
            bp::return_value_policy<bp::copy_const_reference>())
-      .def("matrix",&Quaternion::matrix,"Returns an equivalent rotation matrix")
-      .def("toRotationMatrix ",&Quaternion::toRotationMatrix,"Returns an equivalent 3x3 rotation matrix.")
+      .def("matrix",&Quaternion::matrix,"Returns an equivalent 3x3 rotation matrix. Similar to toRotationMatrix.")
+      .def("toRotationMatrix",&Quaternion::toRotationMatrix,"Returns an equivalent 3x3 rotation matrix.")
       
       .def("setFromTwoVectors",&setFromTwoVectors,((bp::arg("a"),bp::arg("b"))),"Set *this to be the quaternion which transform a into b through a rotation."
            ,bp::return_self<>())