Updated config parser generator
WIP
Merge branch 'martyn82'