generalizes the drawing of entities
Merge pull request #147 from bhattigurjot/master

generalizes the drawing of entities