Fix vars order bug
Merge pull request #26 from ivanzhaowy/master

Fix vars order bug