Updated parser
Merged