Testing syntax highlighting
Added more syntax highlighting
Merge branch 'master' into development