Store actual environment variables

Make sure environment variable value is stored, rather than name. Opened as issue #33