Merge branch 'master' into dev
Reinforced e.preventDefault() with return false
Merge branch 'dev'