Merge branch 'gh-pages'
Various improvements
Seperate mouse/keyboard mode
Merge branch 'master' into gh-pages