Added the ring shapes. Fixed ellipse's contains method. Re #7222