Separate parsers, add tests
Merge pull request #2 from vgrigoriu/master

Separate parsers, add tests