Merge branch 'master' into dev
2.0.1

- Reinforced some keyboard binds with return false
Merge branch 'dev'
Merge branch 'master' into gh-pages