#105 quick post update  + fix in the parser