Crystal parser update

Lauri Himanenrequested to merge
crystal-update into reprocess

Parser fixes based on #491 (closed) and #492 (closed).

Merge request reports