simpler grammar in agreement with stan.json spec
Merge remote-tracking branch 'origin/master'