[Polish] Adjust vars order to fit new version of compass
Merge pull request #25 from ivanzhaowy/master

[Polish] Adjust vars order to fit new version of compass