Added parser
parser fixed, no leak