diff --git a/cmake b/cmake
index cfc25686d5e13c40cd8c47946c5d694b4b085670..61e5574a0615706aab06986f6aecf665ddc31141 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit cfc25686d5e13c40cd8c47946c5d694b4b085670
+Subproject commit 61e5574a0615706aab06986f6aecf665ddc31141
diff --git a/include/eigenpy/details.hpp b/include/eigenpy/details.hpp
index ed7a3cb5cf50335d621429bfc7b386f980839711..693a4b723ce201a6c2fb3a93ce19d7aa87b0ee0b 100644
--- a/include/eigenpy/details.hpp
+++ b/include/eigenpy/details.hpp
@@ -104,6 +104,8 @@ namespace eigenpy
       NumpyMatrixType = reinterpret_cast<PyTypeObject*>(NumpyMatrixObject.ptr());
       NumpyArrayObject = pyModule.attr("ndarray");
       NumpyArrayType = reinterpret_cast<PyTypeObject*>(NumpyArrayObject.ptr());
+      NumpyAsMatrixObject = pyModule.attr("asmatrix");
+      NumpyAsMatrixType = reinterpret_cast<PyTypeObject*>(NumpyAsMatrixObject.ptr());
       
       CurrentNumpyType = NumpyMatrixObject; // default conversion
     }
@@ -113,6 +115,7 @@ namespace eigenpy
     
     // Numpy types
     bp::object NumpyMatrixObject; PyTypeObject * NumpyMatrixType;
+    bp::object NumpyAsMatrixObject; PyTypeObject * NumpyAsMatrixType;
     bp::object NumpyArrayObject; PyTypeObject * NumpyArrayType;
   };
   
diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index de15a34e186d21effecce3886d06cce67abd6c5f..723247bf7a77aac91be4a9de6465a372c81359fc 100644
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -35,4 +35,4 @@ ENDIF()
 
 ADD_PYTHON_UNIT_TEST("py-matrix" "unittest/python/test_matrix.py" "unittest")
 ADD_PYTHON_UNIT_TEST("py-geometry" "unittest/python/test_geometry.py" "unittest")
-ADD_PYTHON_UNIT_TEST("py-switch" "unittest/python/test_switch.py" "unittest")
+ADD_PYTHON_UNIT_TEST("py-switch" "unittest/python/test_switch.py" "python/eigenpy")