Upgrade to version 2.1.3

Consolidation/refactor of parsers