Merge pull request #174 from kamalpreetgrewal/master

sets option variable for all entities and cleans code
live preview for point and line
live preview for circle and ellipse
Merge pull request #175 from bhattigurjot/master

live preview for point and line