Merging environment setup wrapper into working branch.