Added rendering of ellipses and lines.