Refactoring and additional HID work
Merge branch 'master' of github.com:noorus/nil