Fixes #5 - Environment variable support