got y-scale right, removed duplication
merge with Luke
Merge remote-tracking branch 'origin/master'