376 - Adding env vars for database settings
Merge remote-tracking branch 'origin/master'