Fix #22
Add 'move' option