Settings FIXED THANKS TO N.REALE
Merge remote-tracking branch 'origin/master'