Indent  parser file for better clarity
reorder parser predicat to better understanding
Merge remote-tracking branch 'upstream/master'
Merge pull request #478 from vicnet/master

Indent and reorder parser for clarity