Fixed a bug while moving mouse
Merged develop and master