diff --git a/glm/gtx/quaternion.inl b/glm/gtx/quaternion.inl
index 7467b42d..b405cc5e 100644
--- a/glm/gtx/quaternion.inl
+++ b/glm/gtx/quaternion.inl
@@ -249,6 +249,9 @@ namespace glm
 		T cosTheta = dot(orig, dest);
 		tvec3<T, P> rotationAxis;
 
+		if(cosTheta >= static_cast<T>(1) - epsilon<T>())
+			return quat();
+
 		if(cosTheta < static_cast<T>(-1) + epsilon<T>())
 		{
 			// special case when vectors in opposite directions :
diff --git a/readme.md b/readme.md
index 26a36c7e..9e06527e 100644
--- a/readme.md
+++ b/readme.md
@@ -55,6 +55,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 - Fixed strict alignment warnings #235 #370
 - Fixed link errors on compilers not supported default function #377
 - Fixed compilation warnings in vec4
+- Fixed non-identity quaternions for equal vectors #234
 
 #### [GLM 0.9.7.0](https://github.com/g-truc/glm/releases/tag/0.9.7.0) - 2015-08-02
 ##### Features: