Added synthax highlighting
Merged changed