Some changes in move function
Merge pull request #3 from jlightyear/move-refactor

Some changes in move function