Better deploy settings
Merge branch 'master' into v1