Pull request for spheres and ellipsoids

... Argh. Oops.