Fixed some issues related with syntax highlighting
Merge branch 'develop'