Workaround for issue #57

Also, when previewing commits, do not fold the code.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'rvoicilas/master'