Added circle support.