Rescaling is now fixed!!! (Maybe)
Merge remote-tracking branch 'origin/master'