7.x grammar fixes
Additional grammar fixes
Re-added mistakenly removed newline
Merge pull request #10 from daitken/7.x

7.x grammar fixes