Issue #17 - Adding environment variables