Add Keyboard class!
Merge branch 'master' into FestaFiB