Joystick developv2

Fixes issues #5, #4