First version of the parser completed
Merge remote-tracking branch 'origin'