Merge remote-tracking branch 'upstream/master'
hid keys, removed keys
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from IguanaMeow/master

changes