Parsing data partially done
Merge branch 'feature/#5' into develop