#2 Add parsing
Merge branch 'feature-2' into develop