diff --git a/CHANGELOG.md b/CHANGELOG.md
index d379fc1..1cc37a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.13.0] - 2017-04-14
+
+### Added
+
+- Add optional `use_simd` feature to improve the performance of `Vector4<f32>`,
+  `Matrix4<f32>` and `Quaternion<f32>`. According to @DaseinPhaos in #394, under
+  the given benchmark certain operations were able to become up to 60% faster.
+- Add component wise casting for the matrix and point types
+
+### Changed
+
+- Update `serde` to version `0.9`, and use `serde_derive` instead of `serde_macros`.
+
 ## [v0.12.0] - 2016-09-14
 
 ### Changed
@@ -225,30 +238,31 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## v0.0.1 - 2014-06-24
 
-[Unreleased]: https://github.com/bjz/cgmath/compare/v0.12.0...HEAD
-[v0.12.0]: https://github.com/bjz/cgmath/compare/v0.11.0...v0.12.0
-[v0.11.0]: https://github.com/bjz/cgmath/compare/v0.10.0...v0.11.0
-[v0.10.0]: https://github.com/bjz/cgmath/compare/v0.9.1...v0.10.0
-[v0.9.1]: https://github.com/bjz/cgmath/compare/v0.9.0...v0.9.1
-[v0.9.0]: https://github.com/bjz/cgmath/compare/v0.8.0...v0.9.0
-[v0.8.0]: https://github.com/bjz/cgmath/compare/v0.7.0...v0.8.0
-[v0.7.0]: https://github.com/bjz/cgmath/compare/v0.6.0...v0.7.0
-[v0.6.0]: https://github.com/bjz/cgmath/compare/v0.5.0...v0.6.0
-[v0.5.0]: https://github.com/bjz/cgmath/compare/v0.4.0...v0.5.0
-[v0.4.0]: https://github.com/bjz/cgmath/compare/v0.3.1...v0.4.0
-[v0.3.1]: https://github.com/bjz/cgmath/compare/v0.3.0...v0.3.1
-[v0.3.0]: https://github.com/bjz/cgmath/compare/v0.2.0...v0.3.0
-[v0.2.0]: https://github.com/bjz/cgmath/compare/v0.1.6...v0.2.0
-[v0.1.6]: https://github.com/bjz/cgmath/compare/v0.1.5...v0.1.6
-[v0.1.5]: https://github.com/bjz/cgmath/compare/v0.1.4...v0.1.5
-[v0.1.4]: https://github.com/bjz/cgmath/compare/v0.1.3...v0.1.4
-[v0.1.3]: https://github.com/bjz/cgmath/compare/v0.1.2...v0.1.3
-[v0.1.2]: https://github.com/bjz/cgmath/compare/v0.1.1...v0.1.2
-[v0.1.1]: https://github.com/bjz/cgmath/compare/v0.1.0...v0.1.1
-[v0.1.0]: https://github.com/bjz/cgmath/compare/v0.0.8...v0.1.0
-[v0.0.8]: https://github.com/bjz/cgmath/compare/v0.0.7...v0.0.8
-[v0.0.7]: https://github.com/bjz/cgmath/compare/v0.0.6...v0.0.7
-[v0.0.6]: https://github.com/bjz/cgmath/compare/v0.0.5...v0.0.6
-[v0.0.5]: https://github.com/bjz/cgmath/compare/v0.0.4...v0.0.5
-[v0.0.4]: https://github.com/bjz/cgmath/compare/v0.0.3...v0.0.4
-[v0.0.3]: https://github.com/bjz/cgmath/compare/v0.0.1...v0.0.3
+[Unreleased]: https://github.com/brendanzab/cgmath/compare/v0.13.0...HEAD
+[v0.12.0]: https://github.com/brendanzab/cgmath/compare/v0.12.0...v0.13.0
+[v0.12.0]: https://github.com/brendanzab/cgmath/compare/v0.11.0...v0.12.0
+[v0.11.0]: https://github.com/brendanzab/cgmath/compare/v0.10.0...v0.11.0
+[v0.10.0]: https://github.com/brendanzab/cgmath/compare/v0.9.1...v0.10.0
+[v0.9.1]: https://github.com/brendanzab/cgmath/compare/v0.9.0...v0.9.1
+[v0.9.0]: https://github.com/brendanzab/cgmath/compare/v0.8.0...v0.9.0
+[v0.8.0]: https://github.com/brendanzab/cgmath/compare/v0.7.0...v0.8.0
+[v0.7.0]: https://github.com/brendanzab/cgmath/compare/v0.6.0...v0.7.0
+[v0.6.0]: https://github.com/brendanzab/cgmath/compare/v0.5.0...v0.6.0
+[v0.5.0]: https://github.com/brendanzab/cgmath/compare/v0.4.0...v0.5.0
+[v0.4.0]: https://github.com/brendanzab/cgmath/compare/v0.3.1...v0.4.0
+[v0.3.1]: https://github.com/brendanzab/cgmath/compare/v0.3.0...v0.3.1
+[v0.3.0]: https://github.com/brendanzab/cgmath/compare/v0.2.0...v0.3.0
+[v0.2.0]: https://github.com/brendanzab/cgmath/compare/v0.1.6...v0.2.0
+[v0.1.6]: https://github.com/brendanzab/cgmath/compare/v0.1.5...v0.1.6
+[v0.1.5]: https://github.com/brendanzab/cgmath/compare/v0.1.4...v0.1.5
+[v0.1.4]: https://github.com/brendanzab/cgmath/compare/v0.1.3...v0.1.4
+[v0.1.3]: https://github.com/brendanzab/cgmath/compare/v0.1.2...v0.1.3
+[v0.1.2]: https://github.com/brendanzab/cgmath/compare/v0.1.1...v0.1.2
+[v0.1.1]: https://github.com/brendanzab/cgmath/compare/v0.1.0...v0.1.1
+[v0.1.0]: https://github.com/brendanzab/cgmath/compare/v0.0.8...v0.1.0
+[v0.0.8]: https://github.com/brendanzab/cgmath/compare/v0.0.7...v0.0.8
+[v0.0.7]: https://github.com/brendanzab/cgmath/compare/v0.0.6...v0.0.7
+[v0.0.6]: https://github.com/brendanzab/cgmath/compare/v0.0.5...v0.0.6
+[v0.0.5]: https://github.com/brendanzab/cgmath/compare/v0.0.4...v0.0.5
+[v0.0.4]: https://github.com/brendanzab/cgmath/compare/v0.0.3...v0.0.4
+[v0.0.3]: https://github.com/brendanzab/cgmath/compare/v0.0.1...v0.0.3
diff --git a/Cargo.toml b/Cargo.toml
index f19a30b..6b03238 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "cgmath"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Brendan Zabarauskas <bjzaba@yahoo.com.au>",
         "Brian Heylin",
         "Colin Sherratt",
@@ -42,5 +42,5 @@ serde_derive = { version = "0.9", optional = true }
 simd = { version = "0.2", optional = true }
 
 [dev-dependencies]
-glium = "0.15"
+glium = "0.16"
 serde_json = "0.9"
diff --git a/src/quaternion.rs b/src/quaternion.rs
index 4a0888b..5fe0271 100644
--- a/src/quaternion.rs
+++ b/src/quaternion.rs
@@ -630,7 +630,7 @@ impl<S: BaseFloat> Rotation<Point3<S>> for Quaternion<S> {
 
         // same direction
         if ulps_eq!(k_cos_theta, S::one()) {
-            return Quaternion::one();
+            return Quaternion::<S>::one();
         }
 
         let k = (a.magnitude2() * b.magnitude2()).sqrt();