diff --git a/include/eigenpy/eigenpy.hpp b/include/eigenpy/eigenpy.hpp
index b9668da4dc930d6354b67b41b5670738608f8401..75c2c73ef927be1369ab4f4f8c68133e029eabe7 100644
--- a/include/eigenpy/eigenpy.hpp
+++ b/include/eigenpy/eigenpy.hpp
@@ -24,28 +24,28 @@
 
 #endif // if EIGEN_VERSION_AT_LEAST(3,2,0)
 
-#define EIGENPY_MAKE_TYPEDEFS(Type, TypeSuffix, Size, SizeSuffix)   \
+#define EIGENPY_MAKE_TYPEDEFS(Type, Options, TypeSuffix, Size, SizeSuffix)   \
   /** \ingroup matrixtypedefs */                                    \
-  typedef Eigen::Matrix<Type, Size, Size> Matrix##SizeSuffix##TypeSuffix;  \
+  typedef Eigen::Matrix<Type, Size, Size, Options> Matrix##SizeSuffix##TypeSuffix;  \
   /** \ingroup matrixtypedefs */                                    \
   typedef Eigen::Matrix<Type, Size, 1>    Vector##SizeSuffix##TypeSuffix;  \
   /** \ingroup matrixtypedefs */                                    \
   typedef Eigen::Matrix<Type, 1, Size>    RowVector##SizeSuffix##TypeSuffix;
 
-#define EIGENPY_MAKE_FIXED_TYPEDEFS(Type, TypeSuffix, Size)         \
+#define EIGENPY_MAKE_FIXED_TYPEDEFS(Type, Options, TypeSuffix, Size)         \
   /** \ingroup matrixtypedefs */                                    \
-  typedef Eigen::Matrix<Type, Size, Eigen::Dynamic> Matrix##Size##X##TypeSuffix;  \
+  typedef Eigen::Matrix<Type, Size, Eigen::Dynamic, Options> Matrix##Size##X##TypeSuffix;  \
   /** \ingroup matrixtypedefs */                                    \
-  typedef Eigen::Matrix<Type, Eigen::Dynamic, Size> Matrix##X##Size##TypeSuffix;
+  typedef Eigen::Matrix<Type, Eigen::Dynamic, Size, Options> Matrix##X##Size##TypeSuffix;
 
-#define EIGENPY_MAKE_TYPEDEFS_ALL_SIZES(Type, TypeSuffix) \
-  EIGENPY_MAKE_TYPEDEFS(Type, TypeSuffix, 2, 2) \
-  EIGENPY_MAKE_TYPEDEFS(Type, TypeSuffix, 3, 3) \
-  EIGENPY_MAKE_TYPEDEFS(Type, TypeSuffix, 4, 4) \
-  EIGENPY_MAKE_TYPEDEFS(Type, TypeSuffix, Eigen::Dynamic, X) \
-  EIGENPY_MAKE_FIXED_TYPEDEFS(Type, TypeSuffix, 2) \
-  EIGENPY_MAKE_FIXED_TYPEDEFS(Type, TypeSuffix, 3) \
-  EIGENPY_MAKE_FIXED_TYPEDEFS(Type, TypeSuffix, 4)
+#define EIGENPY_MAKE_TYPEDEFS_ALL_SIZES(Type, Options, TypeSuffix) \
+  EIGENPY_MAKE_TYPEDEFS(Type, Options, TypeSuffix, 2, 2) \
+  EIGENPY_MAKE_TYPEDEFS(Type, Options, TypeSuffix, 3, 3) \
+  EIGENPY_MAKE_TYPEDEFS(Type, Options, TypeSuffix, 4, 4) \
+  EIGENPY_MAKE_TYPEDEFS(Type, Options, TypeSuffix, Eigen::Dynamic, X) \
+  EIGENPY_MAKE_FIXED_TYPEDEFS(Type, Options, TypeSuffix, 2) \
+  EIGENPY_MAKE_FIXED_TYPEDEFS(Type, Options, TypeSuffix, 3) \
+  EIGENPY_MAKE_FIXED_TYPEDEFS(Type, Options, TypeSuffix, 4)
 
 namespace eigenpy
 {
@@ -65,10 +65,10 @@ namespace eigenpy
   template<typename MatType,typename EigenEquivalentType>
   EIGENPY_DEPRECATED void enableEigenPySpecific();
 
-  template<typename Scalar>
+  template<typename Scalar, int Options>
   EIGEN_DONT_INLINE void exposeType()
   {
-    EIGENPY_MAKE_TYPEDEFS_ALL_SIZES(Scalar,s);
+    EIGENPY_MAKE_TYPEDEFS_ALL_SIZES(Scalar,Options,s);
     
     ENABLE_SPECIFIC_MATRIX_TYPE(Vector2s);
     ENABLE_SPECIFIC_MATRIX_TYPE(RowVector2s);
@@ -93,6 +93,12 @@ namespace eigenpy
     ENABLE_SPECIFIC_MATRIX_TYPE(MatrixXs);
   }
 
+  template<typename Scalar>
+  EIGEN_DONT_INLINE void exposeType()
+  {
+    exposeType<Scalar,0>();
+  }
+    
 } // namespace eigenpy
 
 #include "eigenpy/details.hpp"
diff --git a/src/eigenpy.cpp b/src/eigenpy.cpp
index c85030b1ff9d87a689ec609635f5caba42f39fb5..85d6f5b18687841307f5bf017761b504e7aebd68 100644
--- a/src/eigenpy.cpp
+++ b/src/eigenpy.cpp
@@ -6,7 +6,6 @@
 #include "eigenpy/eigenpy.hpp"
 #include <stdlib.h>
 
-
 namespace eigenpy
 {
 
diff --git a/src/matrix-complex-double.cpp b/src/matrix-complex-double.cpp
index 899f88fcc7ba53faf94f577fcd5c02844ef74e79..a3fa16341aed82f091b67a5a4975aa52e8e2b8a7 100644
--- a/src/matrix-complex-double.cpp
+++ b/src/matrix-complex-double.cpp
@@ -9,5 +9,6 @@ namespace eigenpy
   void exposeMatrixComplexDouble()
   {
     exposeType<std::complex<double> >();
+    exposeType<std::complex<double>,Eigen::RowMajor>();
   }
 }
diff --git a/src/matrix-complex-float.cpp b/src/matrix-complex-float.cpp
index 323c52d761d71c4427e610f40f3679409ad87343..885d2a3e856fa633e5b05b3045fa511b725e6889 100644
--- a/src/matrix-complex-float.cpp
+++ b/src/matrix-complex-float.cpp
@@ -9,5 +9,6 @@ namespace eigenpy
   void exposeMatrixComplexFloat()
   {
     exposeType<std::complex<float> >();
+    exposeType<std::complex<float>,Eigen::RowMajor>();
   }
 }
diff --git a/src/matrix-complex-long-double.cpp b/src/matrix-complex-long-double.cpp
index 1f987ae10ef913941d9a34d70362f7f11ae41779..b27cf1dd537847969a7d41aa109cbf9ee08e383e 100644
--- a/src/matrix-complex-long-double.cpp
+++ b/src/matrix-complex-long-double.cpp
@@ -9,5 +9,6 @@ namespace eigenpy
   void exposeMatrixComplexLongDouble()
   {
     exposeType<std::complex<long double> >();
+    exposeType<std::complex<long double>,Eigen::RowMajor>();
   }
 }
diff --git a/src/matrix-double.cpp b/src/matrix-double.cpp
index dc84a9c257af26261b39093872dda7c4acb70a30..13215978ac3894939b7cc6acce388abac5078255 100644
--- a/src/matrix-double.cpp
+++ b/src/matrix-double.cpp
@@ -9,5 +9,6 @@ namespace eigenpy
   void exposeMatrixDouble()
   {
     exposeType<double>();
+    exposeType<double,Eigen::RowMajor>();
   }
 }
diff --git a/src/matrix-float.cpp b/src/matrix-float.cpp
index 100b8e9ee77799a0d0cb8e4484abced47a5e3f78..44779560048a561c5b5c2a5b6626d45e99674825 100644
--- a/src/matrix-float.cpp
+++ b/src/matrix-float.cpp
@@ -9,5 +9,6 @@ namespace eigenpy
   void exposeMatrixFloat()
   {
     exposeType<float>();
+    exposeType<float,Eigen::RowMajor>();
   }
 }
diff --git a/src/matrix-int.cpp b/src/matrix-int.cpp
index a4b0d8b2f8f1803350330df7558ca7e764032e5c..476746cc94b7f831f2f49bd3f805f720401941c2 100644
--- a/src/matrix-int.cpp
+++ b/src/matrix-int.cpp
@@ -9,5 +9,6 @@ namespace eigenpy
   void exposeMatrixInt()
   {
     exposeType<int>();
+    exposeType<int,Eigen::RowMajor>();
   }
 }
diff --git a/src/matrix-long-double.cpp b/src/matrix-long-double.cpp
index 1b2a8f71eed54fa5620ff446e8b000f29a7499ce..41bcb69957aefb167b855e9e53e365611b3d7fc4 100644
--- a/src/matrix-long-double.cpp
+++ b/src/matrix-long-double.cpp
@@ -9,5 +9,6 @@ namespace eigenpy
   void exposeMatrixLongDouble()
   {
     exposeType<long double>();
+    exposeType<long double,Eigen::RowMajor>();
   }
 }
diff --git a/src/matrix-long.cpp b/src/matrix-long.cpp
index 835b6cce0c227305b4a0e203cedfed5f04a56a9e..6d34fcef20d93d0f312012cfbf03889462ae167e 100644
--- a/src/matrix-long.cpp
+++ b/src/matrix-long.cpp
@@ -9,5 +9,6 @@ namespace eigenpy
   void exposeMatrixLong()
   {
     exposeType<long>();
+    exposeType<long,Eigen::RowMajor>();
   }
 }