Allow change defaults
Merge branch 'fix_defaults'