Mouse control
Merge origin/master