Feat/refactorparser

Fixes #14