Preference Manager is a singleton. Debating how organize preferences
Merge remote-tracking branch 'origin/master'