Fixed clipping of drawn figure
Added circle fitting to ellipse fitting when there is 3 or 4 points