Add env variables and remove unnecessary parentheses
Merge remote-tracking branch 'origin/master'