Fixed syntax highlighting for different languages

Partially fixes issue mentioned in #1131.
Merge pull request #1154 from splinter89/patch-3

Fixed syntax highlighting for different languages