Extend environment variable support - phase 2
related to
#34 (closed)