Adding Support for Environment variable prefixes
Merge remote-tracking branch 'original/master'