Updated Settings
Merge from master