Added some specifications about some environment variable.
Merge remote-tracking branch 'origin/master'