Move around vars
Merge pull request #190 from dreamteam69/master

Move around vars