* BUGFIX: Crash if scale is lower than 1
Merge remote-tracking branch 'origin/master'