Merge pull request #6 from cburbridge/master

Joystick name