Quote composite variables

Just in case these variables change or include dodgy characters
Merge pull request #9 from kehh/master

Quote composite variables