Ensure diameter not radius
Added support for cylinders - untested