Fixed bug wuth multiple mouse events call
Merge branch 'bug-fixes' into develop