Added Circle and ConvexPolygon classes