added support for configuring max_move
Merge remote-tracking branch 'origin/master'