Fixed handling of encoding and decoding code-blocks
Merge branch 'master' into demo