Updated to use new Matrix3 API, see #71