more advanced movements
Merge remote-tracking branch 'origin/master'