Merge pull request #18 from wick-ed/master

reviewed diff
added envVars to server backreferences