Use instance path instead of instance name, to make variable names
unique.
Merge with the master
Merge remote-tracking branch 'upstream/master'
Merge pull request #55 from gibello/master

Fixed variables naming in exports