Refactoring
Merge pull request #3 from OpenLamas/refactoring

Merge parser changes to the new API