More preferences
Little improvements
Merge remote-tracking branch 'GitHub/master'