Improved the fallback on env vars.
Raised version.
Merge branch 'hotfix/1.5'