7.x grammar fixes
Merge pull request #51 from daitken/7.x

7.x grammar fixes