Merge pull request #1 from zfaustk/master

A
Merge pull request #2 from zfaustk/Grammar

Grammar
create

grammar change
Merge pull request #8 from solamiku/master

create