Avoiding the switch of move() function
Merge pull request #6 from gulucm/move-refactor

Avoiding the switch of move() function