diff --git a/matrix/Vector.hpp b/matrix/Vector.hpp
index 0349060c06..fe9c5a81f6 100644
--- a/matrix/Vector.hpp
+++ b/matrix/Vector.hpp
@@ -66,8 +66,12 @@ public:
         return Type(sqrt(a.dot(a)));
     }
 
-    Vector normalize() const {
-        return  (*this) / norm();
+    inline void normalize() {
+        (*this) /= norm();
+    }
+
+    Vector unit() const {
+        return (*this) / norm();
     }
 
     Vector pow(Type v) const {
diff --git a/test/attitude.cpp b/test/attitude.cpp
index 74ad5379dc..f7857d3cd4 100644
--- a/test/attitude.cpp
+++ b/test/attitude.cpp
@@ -42,16 +42,18 @@ int main()
     TEST(isEqual(euler_copy, euler_check));
 
     // quaternion ctor
-    Quatf q(1, 2, 3, 4);
+    Quatf q0(1, 2, 3, 4);
+    Quatf q(q0);
     TEST(fabs(q(0) - 1) < eps);
     TEST(fabs(q(1) - 2) < eps);
     TEST(fabs(q(2) - 3) < eps);
     TEST(fabs(q(3) - 4) < eps);
 
     // quat normalization
-    q = q.normalize();
+    q.normalize();
     TEST(isEqual(q, Quatf(0.18257419f,  0.36514837f,
                           0.54772256f,  0.73029674f)));
+    TEST(isEqual(q0.unit(), q));
 
     // quat default ctor
     q = Quatf();