add minimum size and scale factor
Merge remote-tracking branch 'origin'