Merge branch 'refactor-parsing'