Updated to GLM 0.9.6