Updated README + changed parser