Work around ANTLR 4.2 issue 461 (fixes #23)
Merge pull request #28 from sharwell/fix-23

Work around ANTLR 4.2 issue 461 (fixes #23)