Generification of the parser improved.
Comments added.