Environment variables now set automatically

Change-Id: I89f2ccced98283b81c85be796557331e8b5b7f26