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

7.x grammar fixes