Merge pull request #31 from bhattigurjot/master

adds condition for ellipse
saves all entities
Merge pull request #32 from kamalpreetgrewal/master

saves all entities