Fixing bug when clicking twice in mark
Merge branch 'master' into gh-pages