refactor grammar to include block of statements
Merge remote-tracking branch 'origin/master'