Merge pull request #87 from alecchendev/parse-env