Variables should be exported
Merge branch 'export-vars'