code format changed in parser
Merge branch 'parser'