Parser updates, config fix
Merge pull request #41 from bserdar/metadata-parser-pqs-fix

Parser updates, config fix