Fixing code block styling
Merge branch 'dev'