Support expansion of environment variables.
Merge pull request #6 from josteink/master

Support expansion of environment variables.
Merge pull request #1 from manojlds/master

t