Shape und Sphere extended

Various changes have been made… ;-)