better environment parsing
Merge pull request #37 from jehiah/env_parsing_37

Better environment variable parsing