Parser fixes new

Implemented various fixes from issue #484 (closed)

Merge request reports

Loading