Feature/grammar v2.1

After grammar-v2, here comes the specification of grammar-v2.1.
@wehlutyk, I let your analytical eyes spot any mis-specification I certainly left in there