First implementation for #12.
Fixed issue #15.
This was a bug in the antlr code generator.