merge changes from

https://github.com/antlr/antlr3/pull/41
https://github.com/stephengaito/antlr3