diff --git a/src/matrix.rs b/src/matrix.rs
index d2bd66e..6687157 100644
--- a/src/matrix.rs
+++ b/src/matrix.rs
@@ -28,6 +28,7 @@ use euler::Euler;
 use num::BaseFloat;
 use point::Point3;
 use quaternion::Quaternion;
+use transform::{Transform, Transform2, Transform3};
 use vector::{Vector2, Vector3, Vector4};
 
 /// A 2 x 2, column major matrix
@@ -755,6 +756,34 @@ impl<S: BaseFloat> ApproxEq for Matrix4<S> {
     }
 }
 
+impl<S: BaseFloat> Transform<Point3<S>> for Matrix4<S> {
+  fn one() -> Matrix4<S> {
+    One::one()
+  }
+
+  fn look_at(eye: Point3<S>, center: Point3<S>, up: Vector3<S>) -> Matrix4<S> {
+    Matrix4::look_at(eye, center, up)
+  }
+
+  fn transform_vector(&self, vec: Vector3<S>) -> Vector3<S> {
+    (self * vec.extend(S::zero())).truncate()
+  }
+
+  fn transform_point(&self, point: Point3<S>) -> Point3<S> {
+    Point3::from_homogeneous(self * point.to_homogeneous())
+  }
+
+  fn concat(&self, other: &Matrix4<S>) -> Matrix4<S> {
+    self * other
+  }
+
+  fn invert(&self) -> Option<Matrix4<S>> {
+    SquareMatrix::invert(self)
+  }
+}
+
+impl<S: BaseFloat> Transform3<S> for Matrix4<S> {}
+
 macro_rules! impl_operators {
     ($MatrixN:ident, $VectorN:ident { $($field:ident : $row_index:expr),+ }) => {
         impl_operator!(<S: BaseFloat> Neg for $MatrixN<S> {
diff --git a/src/transform.rs b/src/transform.rs
index 3bf6a1d..f7c1833 100644
--- a/src/transform.rs
+++ b/src/transform.rs
@@ -197,7 +197,7 @@ impl<S: BaseFloat> Transform<Point3<S>> for AffineMatrix3<S> {
 
     #[inline]
     fn invert(&self) -> Option<AffineMatrix3<S>> {
-        self.mat.invert().map(|m| AffineMatrix3{ mat: m })
+        SquareMatrix::invert(& self.mat).map(|m| AffineMatrix3{ mat: m })
     }
 }