fix
fix
fix settings
Merge remote-tracking branch 'origin/master'