Getting ready for #186 - updated grammar.