Added scale to Graphic
Merge branch 'new' into Compo