implemented better circle support

implemented better circle support