Added an option to disable preview encoding
Merge remote-tracking branch 'origin/master'