Merge pull request #1 from yasselavila/develop

Fix problem with environment vars