Change $_ENV to getenv()
Merge branch 'aug_7_2014'