#401 allow override by environment variables
Merge pull request #421 from joola/feature/#401

#401 allow override by environment variables