User-specific settings
Merge remote-tracking branch 'origin/carlos_settings'