Parser integration Merge

Daniel Speckhardrequested to merge
parser-integration into master

Merging the parser integration branch with the master branch

Merge request reports