Minor changes to ensure table can be easily replicated
Merge remote-tracking branch 'upstream-cwi/master'
Removed nameResolution param, no longer available in parser: it is now handled in this project