optimise code highlighting
Merge branch 'develop'