Fix grammar
Add statement grammar
Merge remote-tracking branch 'origin/master'