Mitch Davis Added support for an arbitrary number of diameters, and diameter inte…