Updated grammar to support disambiguation, added request model to ask for clarity.
Merge remote-tracking branch 'origin/master'