fixed moving off grid
fixed moving off grid
Merge remote-tracking branch 'origin/master'