Committing just so I can pull Jesse’s changes…
Merge remote-tracking branch 'origin/master'
fixed a problem with detecting scales
Merge remote-tracking branch 'origin/master'