Merge pull request #1 from zfaustk/Grammar

Grammar
A

B
Merge pull request #43 from solamiku/master

Grammer alter