Autoload .env file on startup
Merge branch 'master' into mac-os