fix the boxscaling and position again, i think its right but PK has my cable and its hard to see with the webcam
Merge remote-tracking branch 'origin/master'