joystick fix
Merge branch 'master' into McLeodLaptop
bug fix