better logging for the parser
Merge remote-tracking branch 'origin/develop'

* origin/develop:
  better logging for the parser