merge in master
implement syntax highlighting