temporary version - not yet validated

Option savePng added but need to be validated...