added ring number to json +merged master into grammar
merge grammar into master