Merge pull request #147 from bhattigurjot/master

generalizes the drawing of entities
close active subwindow
Merge pull request #148 from CharuChopra84/master

close active subwindow