now the key listener at the about page is more generic
Merge remote-tracking branch 'origin/master'