New parser; proper handling of ENPTVD/ENKRVD.
Merge pull request #563 from osae/testEPS

New parser; proper handling of ENPTVD/ENKRVD.