Improvements to key handling
Merge branch 'master' of https://github.com/thefryscorer/gocontroller