Merge branch 'fixMovement'