remove trailing whitespace
grammar update
Merge branch 'pr/7'