example config and type preferences
Merge remote-tracking branch 'origin/master'