Merge pull request #49 from parrt/master

Update to use 4.2.1 ANTLR