Update ANTLR grammar
Updated README