fix s key did not work
Merge branch 'minimap'
Merge branch 'master' into gh-pages