Implmented mousemove offset to start
Merge branch 'bug-fixes' into develop