Merge pull request #30 from kamalpreetgrewal/master

corrects ellipse orientation
adds condition for ellipse
Merge pull request #31 from bhattigurjot/master

adds condition for ellipse