Add better grammar definition
Merge pull request #15 from ai14/new-grammar

Add better grammar definition