parser updated and included in single file