#187 Using files from Env class
Merge pull request #203 from krzyk/187

#203: pull request #187 Using files from Env class