Fixed a bug, changed parser.