Added encoding in config
Merge remote-tracking branch 'origin/Preview'