Fix issue #722

Merged Alvin Noe Ladines requested to merge parser-fixes into v1.0.0

Merge request reports