move variables
Merge pull request #459 from ctamisier/master

move variables