Adding environment variables, closes #7