Merge pull request #89 from resir014/grammar-fixes