add grammer definition and test code
Merge branch 'dev'