Update parser
Merge branch 'feature-parser' into develop