Added some settings
Added some settings
Merge branch 'env_settings' into develop