and move back
Merge pull request #34 from derwolfe/move_around

and move back