Updated second grammar + makefile
merged