Accept RectangularShapes
Draw string into rectangle
Merge remote-tracking branch 'manu/additions'