#12: add support for hyphenated fields and add tests