Added support for environment variables containing single and/or double
quotes
Merge conflict fix