Feature/fix parse issue

Fixes #1