Updated parser, closing #117