fixed mouse issues (almost)
Merge remote branch 'origin/master'