Functionality to export figures to PNG/EPS (Diagram method printImage)
Some other minor changes