- make the field name pattern configurable
Merge remote-tracking branch 'origin/master'