Added quoting of some variables
Merge pull request #671 from pilgrimagesoftware/master

Added quoting of some variables