Grammar and other refinements, fix for missing dependency

Philip Makedonskirequested to merge
dev into master
  • Grammar and other refinements

Merge request reports