More robust grammar -> explanation system for #170
Merge remote-tracking branch 'origin/master'