fix slight bug on mouse over and mouse leave
Merge remote-tracking branch 'origin/master' into gh-pages