PE-2823 Make module compatible with future parser
Merge pull request #28 from fhrbek/pe_2823_future_parser

PE-2823 Make module compatible with future parser