Merged ellipse
Merge pull request #734 from bvssvni/master

Merged ellipse