Merge pull request #30 from mpeterv/master

Improved controls
Merge remote-tracking branch 'upstream/master'