Updated for latest cgmath-rs