Wrote result parsing class
Merge branch 'dev'