Adding support for environment option.
Merge pull request #3 from tobalsgithub/master

Adding support for environment option.